feat: update gomark version (#3679)

usememos · Jul 12, 2024 · 5a196e2 · 5a196e2
1 parent 9449886
commit 5a196e2
Show file tree

Hide file tree

Showing 8 changed files with 177 additions and 169 deletions.
diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml
@@ -1913,7 +1913,8 @@ definitions:
       cells:
         type: array
         items:
-          type: string
+          type: object
+          $ref: '#/definitions/v1Node'
   UserRole:
     type: string
     enum:
@@ -3045,7 +3046,8 @@ definitions:
       header:
         type: array
         items:
-          type: string
+          type: object
+          $ref: '#/definitions/v1Node'
       delimiter:
         type: array
         items:

diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	github.com/usememos/gomark v0.0.0-20240630131948-9cc984646479
+	github.com/usememos/gomark v0.0.0-20240712135956-99d0ab9b9aa1
 	golang.org/x/crypto v0.25.0
 	golang.org/x/mod v0.19.0
 	golang.org/x/net v0.27.0

diff --git a/go.sum b/go.sum
@@ -441,8 +441,8 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/usememos/gomark v0.0.0-20240630131948-9cc984646479 h1:Agp+J1o5z1n67uG6IKgV/fE72Io1cUF4cfwxjDqW2GY=
-github.com/usememos/gomark v0.0.0-20240630131948-9cc984646479/go.mod h1:7CZRoYFQyyljzplOTeyODFR26O+wr0BbnpTWVLGfKJA=
+github.com/usememos/gomark v0.0.0-20240712135956-99d0ab9b9aa1 h1:4LuNOC1zgAk9K8kZjTBZ/yNJR9vgQTNAQFyWxLxJp5A=
+github.com/usememos/gomark v0.0.0-20240712135956-99d0ab9b9aa1/go.mod h1:7CZRoYFQyyljzplOTeyODFR26O+wr0BbnpTWVLGfKJA=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=

diff --git a/proto/api/v1/markdown_service.proto b/proto/api/v1/markdown_service.proto
@@ -169,11 +169,11 @@ message MathBlockNode {
 }
 
 message TableNode {
-  repeated string header = 1;
+  repeated Node header = 1;
   repeated string delimiter = 2;
 
   message Row {
-    repeated string cells = 1;
+    repeated Node cells = 1;
   }
   repeated Row rows = 3;
 }

diff --git a/proto/gen/api/v1/markdown_service.pb.go b/proto/gen/api/v1/markdown_service.pb.go
diff --git a/server/router/api/v1/markdown_service.go b/server/router/api/v1/markdown_service.go
@@ -133,11 +133,11 @@ func convertFromASTNodes(rawNodes []ast.Node) []*v1pb.Node {
 
 func convertTableFromASTNode(node *ast.Table) *v1pb.TableNode {
 	table := &v1pb.TableNode{
-		Header:    node.Header,
+		Header:    convertFromASTNodes(node.Header),
 		Delimiter: node.Delimiter,
 	}
 	for _, row := range node.Rows {
-		table.Rows = append(table.Rows, &v1pb.TableNode_Row{Cells: row})
+		table.Rows = append(table.Rows, &v1pb.TableNode_Row{Cells: convertFromASTNodes(row)})
 	}
 	return table
 }
@@ -225,11 +225,11 @@ func convertToASTNodes(nodes []*v1pb.Node) []ast.Node {
 
 func convertTableToASTNode(node *v1pb.TableNode) *ast.Table {
 	table := &ast.Table{
-		Header:    node.Header,
+		Header:    convertToASTNodes(node.Header),
 		Delimiter: node.Delimiter,
 	}
 	for _, row := range node.Rows {
-		table.Rows = append(table.Rows, row.Cells)
+		table.Rows = append(table.Rows, convertToASTNodes(row.Cells))
 	}
 	return table
 }
diff --git a/web/src/components/MemoContent/Renderer.tsx b/web/src/components/MemoContent/Renderer.tsx
@@ -86,7 +86,7 @@ const Renderer: React.FC<Props> = ({ index, node }: Props) => {
     case NodeType.MATH_BLOCK:
       return <Math {...(node.mathBlockNode as MathBlockNode)} block={true} />;
     case NodeType.TABLE:
-      return <Table {...(node.tableNode as TableNode)} />;
+      return <Table index={index} {...(node.tableNode as TableNode)} />;
     case NodeType.EMBEDDED_CONTENT:
       return <EmbeddedContent {...(node.embeddedContentNode as EmbeddedContentNode)} />;
     case NodeType.TEXT:

diff --git a/web/src/components/MemoContent/Table.tsx b/web/src/components/MemoContent/Table.tsx
@@ -1,7 +1,9 @@
-import { TableNode_Row } from "@/types/proto/api/v1/markdown_service";
+import { Node, TableNode_Row } from "@/types/proto/api/v1/markdown_service";
+import Renderer from "./Renderer";
 
 interface Props {
-  header: string[];
+  index: string;
+  header: Node[];
   rows: TableNode_Row[];
 }
 
@@ -12,7 +14,7 @@ const Table = ({ header, rows }: Props) => {
         <tr className="divide-x divide-gray-300 dark:divide-zinc-600">
           {header.map((h, i) => (
             <th key={i} className="py-1 px-2">
-              {h}
+              <Renderer key={`${h.type}-${i}`} index={String(i)} node={h} />
             </th>
           ))}
         </tr>
@@ -22,7 +24,7 @@ const Table = ({ header, rows }: Props) => {
           <tr key={i} className="divide-x divide-gray-300 dark:divide-zinc-600">
             {row.cells.map((r, j) => (
               <td key={j} className="py-1 px-2">
-                {r}
+                <Renderer key={`${r.type}-${i}-${j}`} index={String(j)} node={r} />
               </td>
             ))}
           </tr>