Merge branch 'main' into tikz

to resolve conflict in smoke.js due to addition of wireviz Conflicts: ci/tests/smoke.js
yuzutech · Mar 15, 2023 · 8ccaae0 · 8ccaae0
2 parents 86c6ada + a2e21f1
commit 8ccaae0
Show file tree

Hide file tree

Showing 66 changed files with 1,841 additions and 121 deletions.
diff --git a/.github/workflows/cve-scan.yml b/.github/workflows/cve-scan.yml
@@ -10,7 +10,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        image: [ kroki, kroki-mermaid, kroki-bpmn, kroki-excalidraw, kroki-blockdiag, kroki-diagramsnet ]
+        image: [ kroki, kroki-mermaid, kroki-bpmn, kroki-excalidraw, kroki-blockdiag, kroki-diagramsnet, kroki-wireviz ]
         tag: [ latest ]
     steps:
       - name: Run Trivy vulnerability scanner

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
@@ -64,3 +64,12 @@ jobs:
           repository: yuzutech/kroki-diagramsnet
           short-description: Companion server for Kroki that provides diagrams.net (formerly draw.io)
           readme-filepath: ./DOCKERHUB-COMPANION.md
+
+      - name: Docker Hub Description - wireviz
+        uses: peter-evans/dockerhub-description@v3.1.2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: yuzutech/kroki-wireviz
+          short-description: Companion server for Kroki that provides WireViz
+          readme-filepath: ./DOCKERHUB-COMPANION.md
diff --git a/DOCKERHUB.md b/DOCKERHUB.md
@@ -40,6 +40,7 @@ services:
       - KROKI_MERMAID_HOST=mermaid
       - KROKI_BPMN_HOST=bpmn
       - KROKI_EXCALIDRAW_HOST=excalidraw
+      - KROKI_WIREVIZ_HOST=wireviz
     ports:
       - "8000:8000"
   blockdiag:
@@ -58,6 +59,10 @@ services:
     image: yuzutech/kroki-excalidraw
     ports:
       - "8004:8004"
+  wireviz:
+    image: yuzutech/kroki-wireviz
+    ports:
+      - "8006:8006"
 ```
 
 If you don't want to use `docker-compose`, you can configure the host and port for each companion container using environment variables:
@@ -68,6 +73,7 @@ If you don't want to use `docker-compose`, you can configure the host and port f
 | `kroki-mermaid`    | `KROKI_MERMAID_HOST`    | `KROKI_MERMAID_PORT`    |
 | `kroki-bpmn`       | `KROKI_BPMN_HOST`       | `KROKI_BPMN_PORT`       |
 | `kroki-excalidraw` | `KROKI_EXCALIDRAW_HOST` | `KROKI_EXCALIDRAW_PORT` |
+| `kroki-wireviz`    | `KROKI_WIREVIZ_HOST`    | `KROKI_WIREVIZ_PORT`    |
 
 For Kubernetes installation follow the description in [install using Kubernetes](https://docs.kroki.io/kroki/setup/install/#_using_kubernetes) section.
 

diff --git a/Makefile b/Makefile
@@ -7,7 +7,8 @@ SERVICES_TIMEOUT=15
 default:
 
 installLocalDependencies:
-	mvn install:install-file -Dfile=./umlet/lib/umlet-mini-14.3.0.jar -DgroupId=com.umlet -DartifactId=umlet-mini -Dversion=14.3.0 -Dpackaging=jar
+	mvn install:install-file -Dfile=./umlet/lib/umlet-mini-15.0.0.jar -DgroupId=com.umlet -DartifactId=umlet-mini -Dversion=15.0.0 -Dpackaging=jar
+	mvn install:install-file -Dfile=./umlet/lib/umlet-parent-15.0.0.pom -DgroupId=com.umlet -DartifactId=umlet-parent -Dversion=15.0.0 -Dpackaging=pom
 	mvn install:install-file -Dfile=./server/lib/ditaamini-1.0.3.jar -DgroupId=ditaa -DartifactId=ditaa-mini -Dversion=1.0.3 -Dpackaging=jar
 
 buildServer:

diff --git a/README.adoc b/README.adoc
@@ -9,7 +9,7 @@ image:https://github.com/yuzutech/kroki/workflows/CI/badge.svg?branch=master[Git
 image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Zulip chat, link=https://kroki.zulipchat.com/]
 endif::[]
 
-{uri-kroki}[Kroki] provides a unified API with support for BlockDiag (BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag, RackDiag), BPMN, Bytefield, C4 (with PlantUML), D2, DBML, Diagrams.net (experimental), Ditaa, Erd, Excalidraw, GraphViz, Mermaid, Nomnoml, Pikchr, PlantUML, SvgBob, UMLet, Vega, Vega-Lite and WaveDrom... and more to come!
+{uri-kroki}[Kroki] provides a unified API with support for BlockDiag (BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag, RackDiag), BPMN, Bytefield, C4 (with PlantUML), D2, DBML, Diagrams.net (experimental), Ditaa, Erd, Excalidraw, GraphViz, Mermaid, Nomnoml, Pikchr, PlantUML, SvgBob, UMLet, Vega, Vega-Lite, WaveDrom and WireViz... and more to come!
 
 == Quickstart
 
@@ -109,6 +109,9 @@ A companion web server written in JavaScript (powered by _micro_) that provides
 diagrams.net::
 A companion web server written in JavaScript (powered by _micro_) that provides _diagrams.net_.
 
+wireviz::
+A companion web server written in Python (powered by _Flask_ and _Gunicorn_) that provides _WireViz_.
+
 == Build
 
 === Gateway Server
@@ -154,6 +157,9 @@ Excalidraw
 yuzutech/kroki-diagramsnet (experimental)::
 diagrams.net
 
+yuzutech/kroki-wireviz::
+WireViz
+
 You can use `docker-compose` to run multiple containers:
 
 .docker-compose.yml
@@ -168,6 +174,7 @@ services:
       - KROKI_MERMAID_HOST=mermaid
       - KROKI_BPMN_HOST=bpmn
       - KROKI_EXCALIDRAW_HOST=excalidraw
+      - KROKI_WIREVIZ_HOST=wireviz
     ports:
       - "8000:8000"
   blockdiag:
@@ -191,6 +198,10 @@ services:
     image: yuzutech/kroki-diagramsnet
     expose:
       - "8005"
+  wireviz:
+    image: yuzutech/kroki-wireviz
+    ports:
+      - "8006:8006"
 ----
 
  $ docker-compose up -d
diff --git a/SECURITY.md b/SECURITY.md
@@ -4,4 +4,4 @@ If you have found a security issue or concern with Kroki please email the mainta
 
 ## Expectations
 
-We will do everything we can to communicate in a timely manner and address your concerns, but realize that we do have day jobs and this is an open source project so have a little patience if you don't hear back from us immediatly.
+We will do everything we can to communicate in a timely manner and address your concerns, but realize that we do have day jobs and this is an open source project so have a little patience if you don't hear back from us immediately.
diff --git a/ci/tasks/update-versions.js b/ci/tasks/update-versions.js
@@ -121,7 +121,8 @@ const diagramLibraryNames = [
   'umlet',
   'vega',
   'vegalite',
-  'wavedrom'
+  'wavedrom',
+  'wireviz'
 ]
 
 try {
@@ -250,6 +251,7 @@ try {
   await updateServiceGetVersion('Svgbob.java', diagramLibraryVersions.svgbob)
   await updateServiceGetVersion('Umlet.java', diagramLibraryVersions.umlet)
   await updateServiceGetVersion('Wavedrom.java', diagramLibraryVersions.wavedrom)
+  await updateServiceGetVersion('WireViz.java', diagramLibraryVersions.wireviz)
   await updateVegaServiceGetVersion(diagramLibraryVersions.vega, diagramLibraryVersions.vegalite)
 
 } catch (err) {

diff --git a/ci/tests/diagrams/wireviz.yaml b/ci/tests/diagrams/wireviz.yaml
@@ -0,0 +1,26 @@
+connectors:
+  X1:
+    type: D-Sub
+    subtype: female
+    pinlabels: [DCD, RX, TX, DTR, GND, DSR, RTS, CTS, RI]
+  X2:
+    type: Molex KK 254
+    subtype: female
+    pinlabels: [GND, RX, TX]
+
+cables:
+  W1:
+    gauge: 0.25 mm2
+    length: 0.2
+    color_code: DIN
+    wirecount: 3
+    shield: true
+
+connections:
+  -
+    - X1: [5,2,3]
+    - W1: [1,2,3]
+    - X2: [1,3,2]
+  -
+    - X1: 5
+    - W1: s
diff --git a/ci/tests/docker-compose.yaml b/ci/tests/docker-compose.yaml
@@ -14,6 +14,7 @@ services:
       - KROKI_BPMN_HOST=bpmn
       - KROKI_EXCALIDRAW_HOST=excalidraw
       - KROKI_DIAGRAMSNET_HOST=diagramsnet
+      - KROKI_WIREVIZ_HOST=wireviz
     ports:
       - "8000:8000"
 
@@ -41,3 +42,8 @@ services:
     image: yuzutech/kroki-diagramsnet:smoketests
     expose:
       - "8005"
+
+  wireviz:
+    image: yuzutech/kroki-wireviz:smoketests
+    ports:
+      - "8006:8006"
diff --git a/ci/tests/smoke.js b/ci/tests/smoke.js
@@ -37,6 +37,7 @@ const tests = [
   {engine: 'diagramsnet', file: 'diagramsnet-ui.xml', outputFormat: ['svg', 'png']},
   {engine: 'diagramsnet', file: 'diagramsnet-venn.xml', outputFormat: ['svg', 'png']},
   {engine: 'd2', file: 'connections.d2', outputFormat: ['svg']},
+  {engine: 'wireviz', file: 'wireviz.yaml', outputFormat: ['svg', 'png']},
   {engine: 'tikz', file: 'periodic-table.tex', outputFormat: ['jpeg', 'pdf', 'png', 'svg']}
 ]
 

diff --git a/dbml/package-lock.json b/dbml/package-lock.json
diff --git a/dbml/package.json b/dbml/package.json
@@ -15,7 +15,7 @@
   "keywords": [],
   "author": "Bruno Obsomer",
   "dependencies": {
-    "@softwaretechnik/dbml-renderer": "1.0.22"
+    "@softwaretechnik/dbml-renderer": "1.0.26"
   },
   "devDependencies": {
     "standard": "17.0.0"

diff --git a/diagrams.net/assets/stencils/aws/deployment_management.xml b/diagrams.net/assets/stencils/aws/deployment_management.xml
@@ -253,7 +253,7 @@
 <fillstroke/>
 </foreground>
 </shape>
-<shape name="AWS Elastic BeanStalk Applicaton" h="53.89" w="31.1" aspect="variable" strokewidth="inherit">
+<shape name="AWS Elastic BeanStalk Application" h="53.89" w="31.1" aspect="variable" strokewidth="inherit">
 <connections>
 <constraint x="0.5" y="0.07" perimeter="0" name="N"/>
 <constraint x="0.13" y="1" perimeter="0" name="S"/>

diff --git a/diagrams.net/assets/stencils/office/servers.xml b/diagrams.net/assets/stencils/office/servers.xml
@@ -1678,7 +1678,7 @@
         <fillstroke/>
     </foreground>
 </shape>
-<shape aspect="variable" h="59.17" name="Excahnge Client Access Server Role" strokewidth="inherit" w="51.75">
+<shape aspect="variable" h="59.17" name="Exchange Client Access Server Role" strokewidth="inherit" w="51.75">
     <connections/>
     <foreground>
         <path>

diff --git a/docker-bake-release.hcl b/docker-bake-release.hcl
@@ -24,3 +24,7 @@ target "kroki-excalidraw" {
 target "kroki-diagramsnet" {
   tags = ["yuzutech/kroki-diagramsnet:${RELEASE_VERSION}", "yuzutech/kroki-diagramsnet:latest"]
 }
+
+target "kroki-wireviz" {
+  tags = ["yuzutech/kroki-wireviz:${RELEASE_VERSION}", "yuzutech/kroki-wireviz:latest"]
+}
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -3,7 +3,7 @@ variable "TAG" {
 }
 
 group "default" {
-  targets = ["kroki", "kroki-blockdiag", "kroki-mermaid", "kroki-bpmn", "kroki-excalidraw", "kroki-diagramsnet"]
+  targets = ["kroki", "kroki-blockdiag", "kroki-mermaid", "kroki-bpmn", "kroki-excalidraw", "kroki-diagramsnet", "kroki-wireviz"]
 }
 
 target "kroki" {
@@ -45,3 +45,7 @@ target "kroki-diagramsnet" {
   tags = ["yuzutech/kroki-diagramsnet:${TAG}"]
 }
 
+target "kroki-wireviz" {
+  context = "wireviz"
+  tags = ["yuzutech/kroki-wireviz:${TAG}"]
+}
diff --git a/docs/antora.yml b/docs/antora.yml
@@ -9,7 +9,7 @@ asciidoc:
     bytefield-version: 1.7.0
     c4plantuml-version: 1.2022.5
     d2-version: 0.1.5
-    dbml-version: 1.0.22
+    dbml-version: 1.0.26
     diagramsnet-version: 16.2.4
     ditaa-version: 1.0.3
     erd-version: 0.2.1.0
@@ -29,6 +29,7 @@ asciidoc:
     vega-version: 5.22.1
     vegalite-version: 5.6.0
     wavedrom-version: 2.9.1
+    wireviz-version: 0.3.2
     uri-docker-get-started: https://docs.docker.com/get-started/
     uri-podman-get-started: https://podman.io/getting-started/
     uri-docker-compose-install: https://docs.docker.com/compose/install/

diff --git a/docs/modules/ROOT/pages/architecture.adoc b/docs/modules/ROOT/pages/architecture.adoc
@@ -21,9 +21,12 @@ A companion web server written in JavaScript (powered by _micro_) that provides
 Diagrams.net::
 A companion web server written in JavaScript (powered by _micro_) that provides https://www.diagrams.net/[_diagrams.net_] to render diagrams.
 
+WireViz::
+A companion web server written in Python (powered by _Flask_ and _Gunicorn_) that provides WireViz.
+
 == Gateway Server
 
-The Docker image contains the following diagrams libraries out-of-the-box:
+The `yuzutech/kroki` Docker image contains the following diagrams libraries out-of-the-box:
 
 [options="header",cols="1,1m"]
 |===
@@ -88,7 +91,7 @@ The Docker image contains the following diagrams libraries out-of-the-box:
 
 === BlockDiag
 
-The `yuzutech/kroki`  Docker image contains the following diagrams libraries out-of-the-box:
+The `yuzutech/kroki-blockdiag` Docker image contains the following diagrams libraries out-of-the-box:
 
 [options="header",cols="1,1m"]
 |===
@@ -155,3 +158,14 @@ The `yuzutech/kroki-diagramsnet` Docker image contains the following diagrams li
 |https://www.diagrams.net/[diagrams.net]
 |{diagramsnet-version}
 |===
+
+=== WireViz
+
+The `yuzutech/kroki-wireviz` Docker image contains the following diagrams libraries out-of-the-box:
+
+[options="header",cols="1,1m"]
+|===
+|Diagram Type | Version
+|https://github.com/formatc1702/WireViz[WireViz]
+|{wireviz-version}
+|===
diff --git a/docs/modules/ROOT/pages/diagram-types.adoc b/docs/modules/ROOT/pages/diagram-types.adoc
@@ -40,6 +40,7 @@ Diagram::
 * Bytefield diagram
 * Excalidraw
 * https://www.diagrams.net/[diagrams.net] (experimental)
+* WireViz
 
 Visualization::
 * Bar charts

diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -6,7 +6,7 @@
 
 Kroki provides a unified HTTP API with support for BlockDiag (BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag, RackDiag),
 BPMN, Bytefield, C4 (with PlantUML), Diagrams.net (experimental), Ditaa, Erd, Excalidraw, GraphViz, Mermaid, Nomnoml, PlantUML, Structurizr, SvgBob, UMLet,
-Vega, Vega-Lite and WaveDrom... and more to come!
+Vega, Vega-Lite, WaveDrom and WireViz... and more to come!
 
 Kroki is available as a Self-Managed instance. +
 We are also _actively_ looking for sponsors to provide Kroki as a free service:

diff --git a/docs/modules/setup/examples/k8s-multi-pod/kroki-deployment.yaml b/docs/modules/setup/examples/k8s-multi-pod/kroki-deployment.yaml
@@ -25,6 +25,8 @@ spec:
           value: excalidraw
         - name: KROKI_MERMAID_HOST
           value: mermaid
+        - name: KROKI_WIREVIZ_HOST
+          value: wireviz
         image: yuzutech/kroki
         name: kroki
         ports:

diff --git a/docs/modules/setup/examples/k8s-multi-pod/wireviz-deployment.yaml b/docs/modules/setup/examples/k8s-multi-pod/wireviz-deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+  labels:
+    app: wireviz
+  name: wireviz
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: wireviz
+  template:
+    metadata:
+      labels:
+        app: wireviz
+    spec:
+      containers:
+      - image: yuzutech/kroki-wireviz
+        name: wireviz
+        ports:
+        - containerPort: 8006
+      restartPolicy: Always
diff --git a/docs/modules/setup/examples/k8s-multi-pod/wireviz-service.yaml b/docs/modules/setup/examples/k8s-multi-pod/wireviz-service.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+  labels:
+    app: wireviz
+  name: wireviz
+spec:
+  ports:
+  - name: "8006"
+    port: 8006
+    targetPort: 8006
+  selector:
+    app: wireviz
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ If you have found a security issue or concern with Kroki please email the mainta

		## Expectations

		We will do everything we can to communicate in a timely manner and address your concerns, but realize that we do have day jobs and this is an open source project so have a little patience if you don't hear back from us immediatly.
		We will do everything we can to communicate in a timely manner and address your concerns, but realize that we do have day jobs and this is an open source project so have a little patience if you don't hear back from us immediately.