Merge branch 'master' into master

Author: alixander

.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

.prettierignore

@@ -5,3 +5,4 @@ d2renderers/d2latex/polyfills.js
 d2renderers/d2latex/setup.js
 d2renderers/d2sketch/rough.js
 lib/png/generate_png.js
+d2js

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 && prefix "$@" ./make.sh all

README.md

@@ -238,7 +238,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)
@@ -262,6 +262,7 @@ let us know and we'll be happy to include it here!
 - **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)
 
 ### Misc
 
@@ -292,6 +293,12 @@ Do you have or see an open-source project with `.d2` files? Please submit a PR a
 this selected list of featured projects using D2.
 
 - [ElasticSearch](https://github.com/elastic/beats/blob/main/libbeat/publisher/queue/proxy/diagrams/broker.d2)
+- [Sourcegraph](https://handbook.sourcegraph.com/departments/engineering/managed-services/telemetry-gateway/#dev-architecture-diagram)
+- [Temporal](https://github.com/temporalio/temporal/blob/0be2681c994470c7c61ea88e4fcef89bb4024e58/docs/_assets/matching-context.d2)
+- [Tauri](https://v2.tauri.app/concept/inter-process-communication/)
+    - Rust GUI framework (78.5k stars)
+- [Intellij](https://github.com/JetBrains/intellij-community/blob/45bcfc17a3f3e0d8548bc69e922d4ca97ac21b2b/platform/settings/docs/topics/overview.md)
+- [Coder](https://coder.com/blog/managing-templates-in-coder)
 - [UC
   Berkeley](https://github.com/ucb-bar/hammer/blob/2b5c04d7b7d9ee3c73575efcd7ee0698bd5bfa88/doc/Hammer-Use/hier.d2)
 - [Coronacheck](https://github.com/minvws/nl-covid19-coronacheck-app-ios/blob/e1567e9d1633b3273c537a105bff0e7d3a57ecfe/Diagrams/client-side-datamodel.d2)

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

ci/release/build.sh

@@ -10,7 +10,7 @@ cd -- "$(dirname "$0")/../.."
 
 help() {
   cat <<EOF
-usage: $0 [--rebuild] [--local] [--dry-run] [--run=regex] [--host-only] [--lockfile-force]
+usage: $0 [--rebuild] [--dry-run] [--run=regex] [--host-only] [--lockfile-force]
           [--install] [--uninstall]
 
 $0 builds D2 release archives into ./ci/release/build/<version>/d2-<VERSION>-<OS>-<ARCH>.tar.gz
@@ -24,14 +24,6 @@ Flags:
   By default build.sh will avoid rebuilding finished assets if they already exist but if you
   changed something and need to force rebuild, use this flag.
 
---local
-  By default build.sh uses \$CI_D2_LINUX_AMD64, \$CI_D2_LINUX_ARM64,
-  \$CI_D2_MACOS_AMD64 and \$CI_D2_MACOS_ARM64 to build the release
-  archives. It's required for now due to the following issue:
-  https://github.com/terrastruct/d2/issues/31
-  With --local, build.sh will cross compile locally. warning: This is only for testing
-  purposes, do not use in production!
-
 --host-only
   Use to build the release archive for the host OS-ARCH only. All logging is done to stderr
   so in a script you can read from stdout to get the path to the release archive.
@@ -75,10 +67,6 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         REBUILD=1
         ;;
-      local)
-        flag_noarg && shift "$FLAGSHIFT"
-        LOCAL=1
-        ;;
       dry-run)
         flag_noarg && shift "$FLAGSHIFT"
         DRY_RUN=1
@@ -90,7 +78,6 @@ main() {
       host-only)
         flag_noarg && shift "$FLAGSHIFT"
         HOST_ONLY=1
-        LOCAL=1
         ;;
       version)
         flag_nonemptyarg && shift "$FLAGSHIFT"
@@ -104,13 +91,11 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         INSTALL=1
         HOST_ONLY=1
-        LOCAL=1
         ;;
       uninstall)
         flag_noarg && shift "$FLAGSHIFT"
         UNINSTALL=1
         HOST_ONLY=1
-        LOCAL=1
         ;;
       push-docker)
         flag_noarg && shift "$FLAGSHIFT"
@@ -170,45 +155,8 @@ build() {
     return 0
   fi
 
-  if [ -n "${LOCAL-}" ]; then
-    build_local
-    return 0
-  fi
-
-  case $OS in
-    macos)
-      case $ARCH in
-        amd64)
-          REMOTE_HOST=$CI_D2_MACOS_AMD64 build_remote_macos
-          ;;
-        arm64)
-          REMOTE_HOST=$CI_D2_MACOS_ARM64 build_remote_macos
-          ;;
-        *)
-          warn "no builder for OS=$OS ARCH=$ARCH, building locally..."
-          build_local
-          ;;
-      esac
-      ;;
-    linux)
-      case $ARCH in
-        amd64)
-          REMOTE_HOST=$CI_D2_LINUX_AMD64 build_remote_linux
-          ;;
-        arm64)
-          REMOTE_HOST=$CI_D2_LINUX_ARM64 build_remote_linux
-          ;;
-        *)
-          warn "no builder for OS=$OS ARCH=$ARCH, building locally..."
-          build_local
-          ;;
-      esac
-      ;;
-    *)
-      warn "no builder for OS=$OS, building locally..."
-      build_local
-      ;;
-  esac
+  build_local
+  return 0
 }
 
 build_local() {
@@ -221,39 +169,6 @@ build_local() {
   sh_c ./ci/release/_build.sh
 }
 
-build_remote_macos() {(
-  sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock
-  sh_c gitsync "$REMOTE_HOST" src/d2
-  sh_c ssh "$REMOTE_HOST" "COLOR=${COLOR-} \
-TERM=${TERM-} \
-DRY_RUN=${DRY_RUN-} \
-HW_BUILD_DIR=$HW_BUILD_DIR \
-VERSION=$VERSION \
-OS=$OS \
-ARCH=$ARCH \
-ARCHIVE=$ARCHIVE \
-PATH=\\\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\\\${PATH+:\\\$PATH}\\\" \
-./src/d2/ci/release/_build.sh"
-  sh_c mkdir -p "$HW_BUILD_DIR"
-  sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE"
-)}
-
-build_remote_linux() {(
-  sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock
-  sh_c gitsync "$REMOTE_HOST" src/d2
-  sh_c ssh "$REMOTE_HOST" "COLOR=${COLOR-} \
-TERM=${TERM-} \
-DRY_RUN=${DRY_RUN-} \
-HW_BUILD_DIR=$HW_BUILD_DIR \
-VERSION=$VERSION \
-OS=$OS \
-ARCH=$ARCH \
-ARCHIVE=$ARCHIVE \
-./src/d2/ci/release/build_in_docker.sh"
-  sh_c mkdir -p "$HW_BUILD_DIR"
-  sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE"
-)}
-
 build_docker() {
   if [ -n "${LOCAL-}" ]; then
     sh_c ./ci/release/docker/build.sh \

ci/release/changelogs/next.md

@@ -1,3 +1,35 @@
-Hotfix for 0.6.4 breaking plugins, along with 2 other compiler bugfixes.
+#### 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)

ci/release/changelogs/v0.6.6.md

@@ -0,0 +1,23 @@
+#### Features 🚀
+
+- Glob inverse filters are implemented (e.g. `*: {!&shape: circle; style.fill: red}` to turn all non-circles red) [#2008](https://github.com/terrastruct/d2/pull/2008)
+- Globs can be used in glob filter values, including checking for existence (e.g. `*: {&link: *; style.fill: red}` to turn all objects with a link red) [#2009](https://github.com/terrastruct/d2/pull/2009)
+
+#### Improvements 🧹
+
+- Opacity 0 shapes no longer have a label mask which made any segment of connections going through them lower opacity [#1940](https://github.com/terrastruct/d2/pull/1940)
+- Bidirectional connections are now animated in opposite directions rather than one direction [#1939](https://github.com/terrastruct/d2/pull/1939)
+
+#### Bugfixes ⛑️
+
+- Local relative icons are relative to the d2 file instead of CLI invoke path [#1924](https://github.com/terrastruct/d2/pull/1924)
+- Custom label positions weren't being read when the width was smaller than the label [#1928](https://github.com/terrastruct/d2/pull/1928)
+- Using `shape: circle` for arrowheads no longer removes all arrowheads along path in sketch mode [#1942](https://github.com/terrastruct/d2/pull/1942)
+- Globs to null connections work [#1965](https://github.com/terrastruct/d2/pull/1965)
+- Edge globs setting styles inherit correctly in child boards [#1967](https://github.com/terrastruct/d2/pull/1967)
+- Board links imported with spread imports work [#1972](https://github.com/terrastruct/d2/pull/1972)
+- Fix importing a file with nested boards [#1998](https://github.com/terrastruct/d2/pull/1998)
+- Fix importing a file with underscores in links [#1999](https://github.com/terrastruct/d2/pull/1999)
+- Replace a panic with an error message resulting from invalid `link` usage [#2011](https://github.com/terrastruct/d2/pull/2011)
+- Fix globs not applying to scenarios on keys that were applied in earlier scenarios [#2021](https://github.com/terrastruct/d2/pull/2021)
+- Fix edge case of invalid SVG from code blocks [#2031](https://github.com/terrastruct/d2/pull/2031)

ci/release/changelogs/v0.6.7.md

@@ -0,0 +1,38 @@
+#### Features 🚀
+
+- Vars: Variable definitions can refer to other variables in the current scope [#2052](https://github.com/terrastruct/d2/pull/2052)
+- Composition: Imported boards can use underscores to reference boards beyond its own scope (e.g. to a sibling board at the scope its imported to) [#2075](https://github.com/terrastruct/d2/pull/2075)
+- Autoformat: Reserved keywords are formatted to be lowercase [#2098](https://github.com/terrastruct/d2/pull/2098)
+- Misc: support for characters in the Latin-1 and geometric shapes unicode range [#2100](https://github.com/terrastruct/d2/pull/2100)
+- Imports: can now import from absolute file paths [#2113](https://github.com/terrastruct/d2/pull/2113)
+- Render: linear and radial gradients are now available for `fill`, `stroke` and `font-color` [#2120](https://github.com/terrastruct/d2/pull/2120)
+
+#### Improvements 🧹
+
+- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038)
+- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040)
+- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043)
+- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057)
+- Sequence diagram: Image shape actors can use spans and notes [#2056](https://github.com/terrastruct/d2/issues/2056)
+- Globs: Filters work with default values (e.g. `&opacity: 1` will capture everything without opacity explicitly set) [#2090](https://github.com/terrastruct/d2/pull/2090)
+- Render: connection label fills have a bit of padding and border-radius for better aesthetics [#2094](https://github.com/terrastruct/d2/pull/2094)
+- Sequence diagram: the padding between message labels and message endpoints are slightly increased [#2096](https://github.com/terrastruct/d2/pull/2096)
+- Render: code syntax highlighter dependency upgrade caused some slight subtle color changes in code snippets [#2119](https://github.com/terrastruct/d2/pull/2119)
+
+
+#### Bugfixes ⛑️
+
+- Sequence diagram: multi-line edge labels no longer can collide with other elements [#2049](https://github.com/terrastruct/d2/pull/2049)
+- Sequence diagram: long self-referential edge labels no longer can collide neighboring actors (or its own) lifeline edges [#2050](https://github.com/terrastruct/d2/pull/2050)
+- Sequence diagram: fixes layout when sequence diagrams are in children boards (e.g. a layer) [#1692](https://github.com/terrastruct/d2/issues/1692)
+- Globs: An edge case was fixed where globs used in edges were creating nodes when it shouldn't have [#2051](https://github.com/terrastruct/d2/pull/2051)
+- Render: Multi-line class labels/headers are rendered correctly [#2057](https://github.com/terrastruct/d2/pull/2057)
+- CLI: Watch mode uses correct backlinks (`_` usages) [#2058](https://github.com/terrastruct/d2/pull/2058)
+- Vars: Spread variables are inserted in place instead of appending to end of scope [#2062](https://github.com/terrastruct/d2/pull/2062)
+- Imports: fix local icon imports from files that are imported [#2066](https://github.com/terrastruct/d2/pull/2066)
+- CLI: fixes edge case of watch mode links to nested board that had more nested boards not working [#2070](https://github.com/terrastruct/d2/pull/2070)
+- CLI: fixes theme flag not being passed to GIF outputs [#2071](https://github.com/terrastruct/d2/pull/2071)
+- CLI: fixes scale flag not being passed to animated SVG outputs [#2071](https://github.com/terrastruct/d2/pull/2071)
+- CLI: pptx exports use theme flags correctly [#2099](https://github.com/terrastruct/d2/pull/2099)
+- Imports: importing files with url links is fixed [#2105](https://github.com/terrastruct/d2/pull/2105)
+- Composition: linking to invalid boards no longer produces an invalid link [#2118](https://github.com/terrastruct/d2/pull/2118)

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)

ci/release/docker/Dockerfile

@@ -5,9 +5,9 @@ ARG TARGETARCH
 
 RUN apt-get update && apt-get install -y ca-certificates curl dumb-init sudo
 
-RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -s - && \
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -s - && \
   apt-get install -y nodejs
-RUN npx playwright@1.31.1 install --with-deps chromium
+RUN npx playwright@1.45.3 install --with-deps chromium
 
 RUN adduser --gecos '' --disabled-password debian \
   && echo "debian ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd