Added Tag#toAnsi()

latvian-dev · Sep 18, 2023 · 3c14883 · 3c14883
1 parent 3f3450e
commit 3c14883
Show file tree

Hide file tree

Showing 7 changed files with 385 additions and 309 deletions.
diff --git a/src/main/java/dev/latvian/apps/webutils/html/PairedTag.java b/src/main/java/dev/latvian/apps/webutils/html/PairedTag.java
@@ -1,5 +1,8 @@
 package dev.latvian.apps.webutils.html;
 
+import dev.latvian.apps.webutils.ansi.Ansi;
+import dev.latvian.apps.webutils.ansi.AnsiComponent;
+
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -136,4 +139,25 @@ public void write(Writer writer) throws Throwable {
 			writer.write('>');
 		}
 	}
+
+	@Override
+	public void ansi(AnsiComponent component, int depth) {
+		int col = TagUtils.ANSI_COLORS[depth % TagUtils.ANSI_COLORS.length];
+
+		if (!this.name.isEmpty()) {
+			component.append(Ansi.of("<" + this.name).color(col));
+			TagUtils.ansiAttributes(component, this.attributes, depth);
+			component.append(Ansi.of(">").color(col));
+		}
+
+		if (this.content != null && !this.content.isEmpty()) {
+			for (var tag : this.content) {
+				tag.ansi(component, depth + 1);
+			}
+		}
+
+		if (!this.name.isEmpty()) {
+			component.append(Ansi.of("</" + this.name + ">").color(col));
+		}
+	}
 }
diff --git a/src/main/java/dev/latvian/apps/webutils/html/RawTag.java b/src/main/java/dev/latvian/apps/webutils/html/RawTag.java
@@ -1,7 +1,5 @@
 package dev.latvian.apps.webutils.html;
 
-import java.io.Writer;
-
 public class RawTag extends StringTag {
 	public RawTag(String string) {
 		super(string);
@@ -16,9 +14,4 @@ public String getRawContent() {
 	public StringTag child(String string) {
 		return new RawTag(string);
 	}
-
-	@Override
-	public void write(Writer writer) throws Throwable {
-		writer.write(string);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/webutils/html/StringTag.java b/src/main/java/dev/latvian/apps/webutils/html/StringTag.java
@@ -1,5 +1,7 @@
 package dev.latvian.apps.webutils.html;
 
+import dev.latvian.apps.webutils.ansi.AnsiComponent;
+
 import java.io.Writer;
 
 public class StringTag extends Tag {
@@ -30,6 +32,11 @@ public StringTag child(String string) {
 
 	@Override
 	public void write(Writer writer) throws Throwable {
-		TagUtils.encode(writer, string);
+		writer.write(getRawContent());
+	}
+
+	@Override
+	public void ansi(AnsiComponent component, int depth) {
+		component.append(getRawContent());
 	}
 }
diff --git a/src/main/java/dev/latvian/apps/webutils/html/Tag.java b/src/main/java/dev/latvian/apps/webutils/html/Tag.java
@@ -1,10 +1,10 @@
 package dev.latvian.apps.webutils.html;
 
 import dev.latvian.apps.webutils.ansi.Ansi;
+import dev.latvian.apps.webutils.ansi.AnsiComponent;
 import dev.latvian.apps.webutils.net.Response;
 import io.javalin.http.Context;
 import io.javalin.http.HttpStatus;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.StringWriter;
@@ -54,12 +54,10 @@ public final Tag add(TagConvertible tag) {
 		return this;
 	}
 
-	@ApiStatus.Internal
 	public Tag attr(String key, Object value) {
 		throw new IllegalStateException("This tag type does not support attributes");
 	}
 
-	@ApiStatus.Internal
 	public Tag attr(String key) {
 		return attr(key, "<NO_VALUE>");
 	}
@@ -98,6 +96,8 @@ public void replace(Pattern pattern, BiConsumer<Tag, Matcher> replace) {
 
 	public abstract void write(Writer writer) throws Throwable;
 
+	public abstract void ansi(AnsiComponent component, int depth);
+
 	@Override
 	public String toString() {
 		var writer = new StringWriter();
@@ -114,6 +114,12 @@ public String toString() {
 		return writer.toString();
 	}
 
+	public AnsiComponent toAnsi() {
+		var component = Ansi.of();
+		ansi(component, 0);
+		return component;
+	}
+
 	public void result(Context ctx) {
 		result(ctx, HttpStatus.OK);
 	}
@@ -158,14 +164,12 @@ public Tag raw(Object string) {
 		return add(new RawTag(String.valueOf(string)));
 	}
 
-	@ApiStatus.Internal
 	public UnpairedTag unpaired(String name) {
 		var tag = new UnpairedTag(name);
 		add(tag);
 		return tag;
 	}
 
-	@ApiStatus.Internal
 	public PairedTag paired(String name) {
 		var tag = new PairedTag(name);
 		add(tag);
@@ -343,6 +347,29 @@ public Tag h3() {
 		return paired("h3");
 	}
 
+	public Tag h4() {
+		return paired("h4");
+	}
+
+	public Tag h5() {
+		return paired("h5");
+	}
+
+	public Tag h6() {
+		return paired("h6");
+	}
+
+	public Tag heading(int heading) {
+		return switch (heading) {
+			case 1 -> h1();
+			case 2 -> h2();
+			case 3 -> h3();
+			case 4 -> h4();
+			case 5 -> h5();
+			default -> heading <= 0 ? this : h6();
+		};
+	}
+
 	public Tag ol() {
 		return paired("ol");
 	}
@@ -434,6 +461,10 @@ public Tag iframe(String name) {
 		return paired("iframe").attr("name", name);
 	}
 
+	public Tag pre() {
+		return paired("pre");
+	}
+
 	// Form
 
 	public String getPrefix() {