code cleanup, lil refactor

src/main/scala/typography/Code.scala

@@ -1,7 +1,7 @@
 package halotukozak.smark
 package typography
 
-import typography.macros.{codeUnsafe, text}
+import typography.macros.text
 import utils.nameOf
 
 type code <: String
@@ -13,7 +13,7 @@ type sql <: code
 type bash <: code
 type html <: code
 
-inline def code[L <: code](inline code: L): String = codeUnsafe(nameOf[L], code)
+inline def code[L <: code](inline inner: L): String = "```" + nameOf[L] + "\n" + inner + "\n```"
 
 implicit class ScalaHelper(private val sc: StringContext) extends AnyVal {
   def scala(args: Any*): scala = sc.s(args *).asInstanceOf[scala]

src/main/scala/typography/Emoji.scala

@@ -1,6 +1,10 @@
 package halotukozak.smark
 package typography
 
+import utils.nameOf
+
+inline def emoji[E <: Emoji] = s":${nameOf[E]}:"
+
 type Emoji
 
 type grinning <: Emoji

src/main/scala/typography/Headings.scala

@@ -3,3 +3,5 @@ package typography
 
 
 private[typography] type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6
+
+inline def heading[N <: HeadingLevel : ValueOf](inline inner: String): String = "#" * valueOf[N] + inner

src/main/scala/typography/List.scala

@@ -8,4 +8,3 @@ type Unordered = Asterisk | Plus | Hyphen
 type Ordered
 
 private[typography] type ListStyle = Unordered | Ordered
-

src/main/scala/typography/Quote.scala

@@ -7,4 +7,4 @@ inline def note(inline inner: String*): String = quote[Note](inner *)
 inline def tip(inline inner: String*): String = quote[Tip](inner *)
 inline def important(inline inner: String*): String = quote[Important](inner *)
 inline def warning(inline inner: String*): String = quote[Warning](inner *)
-inline def caution(inline inner: String*): String = quote[Caution](inner *)
+inline def caution(inline inner: String*): String = quote[Caution](inner *)

src/main/scala/typography/Reference.scala

@@ -11,4 +11,4 @@ inline def link[Title <: String](inline url: String): String = s"[${titleFrom[Ti
 inline def link(inline url: String, inline title: String): String = s"[$title]($url)"
 
 inline def image[title <: String](inline url: String): String = s"!${link[title](url)}"
-inline def image(inline url: String, inline title: String): String = s"!${link(url, title)}"
+inline def image(inline url: String, inline title: String): String = s"!${link(url, title)}"

src/main/scala/typography/Text.scala

@@ -27,5 +27,3 @@ inline def strikethrough(inner: String): String = text[Strikethrough](inner)
 inline def subscript(inner: String): String = text[Subscript](inner)
 inline def superscript(inner: String): String = text[Superscript](inner)
 inline def quoted(inner: String): String = text[Quote](inner)
-
-

src/main/scala/typography/other.scala

@@ -1,8 +1,7 @@
 package halotukozak.smark
 package typography
 
-
 inline def hr: String = "***"
 inline def paragraph(inline inner: String*): String = "\n" + inner.mkString("\n\n")
 inline def comment(inline inner: String*): String = s"<!-- $inner -->"
-inline def html(inline args: String*): String = "\n" + args.mkString("\n") + "\n"
+inline def html(inline args: String*): String = "\n" + args.mkString("\n") + "\n"

src/test/scala/typography/CodeTest.scala

@@ -1,7 +1,7 @@
 package halotukozak.smark
 package typography
 
-import typography.macros.{codeUnsafe, text}
+import typography.macros.text
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
@@ -84,11 +84,11 @@ final class CodeTest extends AnyWordSpec with Matchers {
             |```""".stripMargin
       }
       "custom" in {
-        codeUnsafe(
-          "custom",
+        type custom <: code
+        code[custom](
           """
             |println("HelloWorld")
-            |""".stripMargin) shouldBe
+            |""".stripMargin.asInstanceOf[custom]) shouldBe
           """```custom
             |
             |println("HelloWorld")

src/test/scala/typography/EmojiTest.scala

@@ -1,8 +1,6 @@
 package halotukozak.smark
 package typography
 
-import typography.macros.{emoji, emojiUnsafe}
-
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
@@ -14,12 +12,4 @@ class EmojiTest extends AnyWordSpec with Matchers {
       emoji[`+1`] shouldBe ":+1:"
     }
   }
-
-  "unsafeEmoji" should {
-    "be evaluated correctly" in {
-      emojiUnsafe("smile") shouldBe ":smile:"
-      emojiUnsafe("+1") shouldBe ":+1:"
-    }
-  }
-
 }