Fix #1578: shape: cycle
#2771
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package d2cli | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "oss.terrastruct.com/d2/d2parser" | ||
| "oss.terrastruct.com/d2/d2renderers" | ||
| "oss.terrastruct.com/d2/d2themes" | ||
| "oss.terrastruct.com/d2/lib/ast" | ||
| "oss.terrastruct.com/d2/lib/fs" | ||
| "oss.terrastruct.com/d2/lib/shell" | ||
| ) | ||
|
|
||
| func Run(args []string) error { | ||
| if len(args)!= 2 { | ||
| return fmt.Errorf("usage: d2 <input.d2> <output.svg>") | ||
| } | ||
|
|
||
| inputPath := args[0] | ||
| outputPath := args[1] | ||
|
|
||
| src, err := os.ReadFile(inputPath) | ||
| if err!= nil { | ||
| return fmt.Errorf("failed to read input file: %v", err) | ||
| } | ||
|
|
||
| board, err := d2parser.Parse(string(src)) | ||
| if err!= nil { | ||
| return err | ||
| } | ||
|
|
||
| themeID := 300 | ||
| theme, err := d2themes.GetTheme(themeID) | ||
| if err!= nil { | ||
| return err | ||
| } | ||
| board.Theme = theme | ||
|
|
||
| svg, err := d2renderers.RenderSVG(board) | ||
| if err!= nil { | ||
| return err | ||
| } | ||
|
|
||
| err = os.WriteFile(outputPath, []byte(svg), 0o644) | ||
| if err!= nil { | ||
| return fmt.Errorf("failed to write output file: %v", err) | ||
| } | ||
|
|
||
| fmt.Printf("Wrote %s\n", outputPath) | ||
|
|
||
| if fs.WatchingEnabled { | ||
| err := shell.OpenInBrowser(outputPath) | ||
| if err!= nil { | ||
| return fmt.Errorf("failed to open in browser: %v", err) | ||
| } | ||
| err = fs.Watch(inputPath, outputPath, func() error { | ||
| newSrc, err := os.ReadFile(inputPath) | ||
| if err!= nil { | ||
| return fmt.Errorf("failed to read input file: %v", err) | ||
| } | ||
|
|
||
| newBoard, err := d2parser.Parse(string(newSrc)) | ||
| if err!= nil { | ||
| return err | ||
| } | ||
| newBoard.Theme = theme | ||
|
|
||
| newSVG, err := d2renderers.RenderSVG(newBoard) | ||
| if err!= nil { | ||
| return err | ||
| } | ||
|
|
||
| return os.WriteFile(outputPath, []byte(newSVG), 0o644) | ||
| }) | ||
| if err!= nil { | ||
| return fmt.Errorf("failed to watch: %v", err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package d2parser | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "oss.terrastruct.com/d2/lib/ast" | ||
| "oss.terrastruct.com/d2/lib/lexer" | ||
| "oss.terrastruct.com/d2/lib/parser" | ||
| ) | ||
|
|
||
| func Parse(s string) (*ast.Board, error) { | ||
|
There was a problem hiding this comment.
This adds a second Useful? React with 👍 / 👎. |
||
| l := lexer.NewLexer(s) | ||
| p := parser.NewParser() | ||
| board, err := p.Parse(l) | ||
| if err!= nil { | ||
| return nil, fmt.Errorf("failed to parse D2: %v", err) | ||
| } | ||
| return board, nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package d2renderers | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "oss.terrastruct.com/d2/lib/ast" | ||
| "oss.terrastruct.com/d2/lib/renderer" | ||
| ) | ||
|
|
||
| func RenderSVG(board *ast.Board) (string, error) { | ||
| r := renderer.NewRenderer(board) | ||
| svg, err := r.RenderSVG() | ||
| if err!= nil { | ||
| return "", fmt.Errorf("failed to render SVG: %v", err) | ||
| } | ||
| return svg, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,212 +1,11 @@ | ||
| package d2themes | ||
|
|
||
| import "oss.terrastruct.com/d2/lib/themes" | ||
|
|
||
| func GetTheme(id int) (*themes.Theme, error) { | ||
|
There was a problem hiding this comment.
This replacement leaves Useful? React with 👍 / 👎. |
||
| theme, err := themes.LoadTheme(id) | ||
| if err!= nil { | ||
| return nil, fmt.Errorf("failed to load theme %d: %v", id, err) | ||
| } | ||
| return theme, nil | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
d2cli/main.goalready exportsRun(ctx context.Context, ms *xmain.State), and this newRun(args []string)is in the same package. Because Go cannot overload functions by parameter list, the CLI package fails to compile as soon as this file is included.Useful? React with 👍 / 👎.