diff --git a/d2chaos/d2chaos_test.go b/d2chaos/d2chaos_test.go index 8b73e4e82..cc6f99781 100644 --- a/d2chaos/d2chaos_test.go +++ b/d2chaos/d2chaos_test.go @@ -128,7 +128,7 @@ func test(t *testing.T, textPath, text string) { t.Fatal(err) } - _, err = d2exporter.Export(ctx, g, 0, nil) + _, err = d2exporter.Export(ctx, g, nil) if err != nil { t.Fatal(err) } diff --git a/d2exporter/export_test.go b/d2exporter/export_test.go index 613090be5..0dab42c46 100644 --- a/d2exporter/export_test.go +++ b/d2exporter/export_test.go @@ -244,7 +244,7 @@ func run(t *testing.T, tc testCase) { t.Fatal(err) } - got, err := d2exporter.Export(ctx, g, tc.themeID, nil) + got, err := d2exporter.Export(ctx, g, nil) if err != nil { t.Fatal(err) } diff --git a/docs/examples/lib/2-d2oracle/d2oracle.go b/docs/examples/lib/2-d2oracle/d2oracle.go index 617943e15..763110f07 100644 --- a/docs/examples/lib/2-d2oracle/d2oracle.go +++ b/docs/examples/lib/2-d2oracle/d2oracle.go @@ -8,7 +8,6 @@ import ( "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2oracle" - "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -17,9 +16,8 @@ func main() { // From one.go ruler, _ := textmeasure.NewRuler() _, graph, _ := d2lib.Compile(context.Background(), "x -> y", &d2lib.CompileOptions{ - Layout: d2dagrelayout.DefaultLayout, - Ruler: ruler, - ThemeID: d2themescatalog.GrapeSoda.ID, + Layout: d2dagrelayout.DefaultLayout, + Ruler: ruler, }) // Create a shape with the ID, "meow" diff --git a/docs/examples/lib/3-lowlevel/lowlevel.go b/docs/examples/lib/3-lowlevel/lowlevel.go index 1912137f4..6ed143a3f 100644 --- a/docs/examples/lib/3-lowlevel/lowlevel.go +++ b/docs/examples/lib/3-lowlevel/lowlevel.go @@ -3,6 +3,7 @@ package main import ( "context" "io/ioutil" + "math" "path/filepath" "strings" @@ -20,9 +21,11 @@ func main() { ruler, _ := textmeasure.NewRuler() _ = graph.SetDimensions(nil, ruler, nil) _ = d2dagrelayout.Layout(context.Background(), graph, nil) - diagram, _ := d2exporter.Export(context.Background(), graph, d2themescatalog.NeutralDefault.ID, nil) + diagram, _ := d2exporter.Export(context.Background(), graph, nil) out, _ := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: d2svg.DEFAULT_PADDING, + Pad: d2svg.DEFAULT_PADDING, + ThemeID: d2themescatalog.NeutralDefault.ID, + DarkThemeID: math.MaxInt64, // Without dark theme }) _ = ioutil.WriteFile(filepath.Join("out.svg"), out, 0600) } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 02ede7ad0..d27571ad2 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -137,6 +137,7 @@ "Host": "icons.terrastruct.com", "Path": "/essentials/004-picture.svg", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 0e52a0d08..222d300dd 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -218,6 +218,7 @@ "Host": "icons.terrastruct.com", "Path": "/essentials/004-picture.svg", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 536e221da..e392c8e8c 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -368,6 +368,7 @@ "Host": "", "Path": "orange", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index f0ad64dc5..1f2d3e57c 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B1", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index b969cc427..e0e989f71 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B1", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index c5af318a2..a71f54b4b 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 4, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B2", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index cdd6312cc..f044df522 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#000E3D", + "stroke": "B1", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, @@ -126,12 +126,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#000E3D", + "stroke": "B1", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index 8b0dade11..68cce6dec 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index f29c3706e..845ae21c6 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,7 +95,7 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B1", "label": "yo", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index 5494c51ed..4073bdd9d 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index 89527e453..535a56709 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index cc3ce4591..ea73fdbab 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 5, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index 1eefa6568..7f435eaa7 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", - "stroke": "#0D32B2", + "fill": "N7", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -30,6 +30,7 @@ "Host": "icons.terrastruct.com", "Path": "/essentials/004-picture.svg", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", @@ -44,7 +45,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json index 9e3211736..9c955ada7 100644 --- a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json +++ b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 0, "borderRadius": 0, - "fill": "#FFFFFF", - "stroke": "#0D32B2", + "fill": "N7", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 28, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", + "fill": "B5", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, @@ -95,8 +95,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", + "fill": "B5", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -113,7 +113,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, @@ -135,8 +135,8 @@ "strokeDash": 0, "strokeWidth": 0, "borderRadius": 0, - "fill": "#DEE1EB", - "stroke": "#0D32B2", + "fill": "N5", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -153,7 +153,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, @@ -175,12 +175,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B1", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, @@ -205,12 +205,12 @@ "opacity": 1, "strokeDash": 6, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B2", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, @@ -235,12 +235,12 @@ "opacity": 1, "strokeDash": 6, "strokeWidth": 2, - "stroke": "#0D32B2", + "stroke": "B2", "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index 9f5b94599..8ebe533cd 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index 603dc86bc..e1a7f933b 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -16,7 +16,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "transparent", - "stroke": "#0A0F25", + "stroke": "N1", "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index ac931ddbc..8a7d857b0 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#000E3D", + "stroke": "B1", "label": "asdf", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index f86879e36..a549b5e23 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#000E3D", + "stroke": "B1", "label": "asdf", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index a7c2eb6b0..70d6c4b7c 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -55,8 +55,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -73,7 +73,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": true, "underline": false, @@ -95,12 +95,12 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "#000E3D", + "stroke": "B1", "label": "asdf", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 4959e7ee9..ee44ec8fc 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#676C7E", + "color": "N2", "italic": true, "bold": true, "underline": false, diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index ef08f8094..b28901f3e 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -15,8 +15,8 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E7EAFF", - "stroke": "#000E3D", + "fill": "B6", + "stroke": "B1", "shadow": false, "3d": false, "multiple": false, @@ -33,7 +33,7 @@ "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "#0A0F25", + "color": "N1", "italic": false, "bold": false, "underline": false, diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 42a7dc91f..ca1d82f8e 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -235,6 +235,7 @@ "Host": "icons.terrastruct.com", "Path": "/essentials/142-target.svg", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "", diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index e039759f1..1327bba31 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -132,6 +132,7 @@ "Host": "icons.terrastruct.com", "Path": "/essentials/087-menu.svg", "RawPath": "", + "OmitHost": false, "ForceQuery": false, "RawQuery": "", "Fragment": "",