web uiの追加 (#37)

* add webui * ラベル修正 * サブグラフ取り出し機能実装 * フィルター解除ボタン追加 * lintエラー修正
mazrean · Dec 7, 2024 · abb5e22 · abb5e22
1 parent 60abc71
commit abb5e22
Show file tree

Hide file tree

Showing 10 changed files with 414 additions and 185 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-dist
+dist
+/isucrud
diff --git a/dbdoc/dbdoc.go b/dbdoc/dbdoc.go
@@ -3,7 +3,6 @@ package dbdoc
 import (
 	"fmt"
 	"go/token"
-	"os"
 
 	"golang.org/x/tools/go/packages"
 	"golang.org/x/tools/go/ssa"
@@ -19,25 +18,25 @@ type Config struct {
 	DestinationFilePath          string
 }
 
-func Run(conf Config) error {
+func Run(conf Config) ([]*Node, error) {
 	ctx := &Context{
 		FileSet: token.NewFileSet(),
 		WorkDir: conf.WorkDir,
 	}
 
 	ssaProgram, pkgs, err := BuildSSA(ctx, conf.BuildArgs)
 	if err != nil {
-		return fmt.Errorf("failed to build ssa: %w", err)
+		return nil, fmt.Errorf("failed to build ssa: %w", err)
 	}
 
 	loopRangeMap, err := BuildLoopRangeMap(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to build loop range map: %w", err)
+		return nil, fmt.Errorf("failed to build loop range map: %w", err)
 	}
 
 	funcs, err := BuildFuncs(ctx, pkgs, ssaProgram, loopRangeMap)
 	if err != nil {
-		return fmt.Errorf("failed to build funcs: %w", err)
+		return nil, fmt.Errorf("failed to build funcs: %w", err)
 	}
 
 	nodes := BuildGraph(
@@ -46,18 +45,7 @@ func Run(conf Config) error {
 		conf.IgnoreMain, conf.IgnoreInitialize,
 	)
 
-	f, err := os.Create(conf.DestinationFilePath)
-	if err != nil {
-		return fmt.Errorf("failed to make directory: %w", err)
-	}
-	defer f.Close()
-
-	err = WriteMermaid(f, nodes)
-	if err != nil {
-		return fmt.Errorf("failed to write mermaid: %w", err)
-	}
-
-	return nil
+	return nodes, nil
 }
 
 func BuildSSA(ctx *Context, args []string) (*ssa.Program, []*packages.Package, error) {

diff --git a/dbdoc/mermaid.go b/dbdoc/mermaid.go
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mazrean/isucrud
 
-go 1.22.0
+go 1.23
 
 toolchain go1.22.9
 

diff --git a/internal/pkg/list/queue.go b/internal/pkg/list/queue.go
@@ -39,6 +39,19 @@ func (q Queue[T]) Peek() (T, bool) {
 	return e.Value()
 }
 
+func (q *Queue[T]) Iter(yield func(T) bool) {
+	for e := q.l.Front(); e.e != nil; e = q.l.Front() {
+		q.l.Remove(e)
+
+		v, ok := e.Value()
+		if !ok {
+			break
+		}
+
+		yield(v)
+	}
+}
+
 func (q Queue[T]) Clear() {
 	q.l.Init()
 }
diff --git a/internal/ui/asset/template.html b/internal/ui/asset/template.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="ja">
+
+<head>
+  <meta charset="UTF-8">
+  <title>Mermaid</title>
+  <script src="https://unpkg.com/mermaid/dist/mermaid.min.js"
+    integrity="sha512-3PBlo2Duz3n8ZReWwpL22r4w1JZH8ZRv2cdYkXZ4K+O50hB9KdKfJ5Tevi5M1fCqfH7GQt2AcDDMRrneJ/dfYw=="
+    crossorigin="anonymous"></script>
+  <script>
+    mermaid.initialize({
+      startOnLoad: true,
+      theme: 'defalt',
+      // clockを有効にするためにセキュリティレベルを下げる
+      securityLevel: 'loose',
+    });
+  </script>
+</head>
+
+<body>
+  {{if .IsFiltered}}<button onclick="location.href = '/'">全ノードを表示する</button>{{end}}
+  <div>
+    nodes: 
+    {{range .NodeTypes}}<span>
+      <span style="color: #{{.Color}};">■</span>
+      {{.Label}}
+    </span>{{end}}
+  </div><div>
+    edges:
+    {{range .EdgeTypes}}<span>
+      <span style="color: #{{.Color}};">■</span>
+      {{.Label}}
+    </span>{{end}}
+  </div>
+  <div
+    class="mermaid"
+    id="mermaid-data"
+  >{{.MermaidData}}</div>
+</body>
+
+</html>
diff --git a/internal/ui/asset/template.md b/internal/ui/asset/template.md
@@ -0,0 +1,7 @@
+# DB Graph
+node: {{range .NodeTypes}}![](https://via.placeholder.com/16/{{.Color}}/FFFFFF/?text=%20) `{{.Label}}` {{end}}
+
+edge: {{range .EdgeTypes}}![](https://via.placeholder.com/16/{{.Color}}/FFFFFF/?text=%20) `{{.Label}}` {{end}}
+```mermaid
+{{.MermaidData}}
+```