feat: make output of @crayon/literal the same as @crayon/crayon

crayon-js · Aug 17, 2024 · 66179f8 · 66179f8
1 parent 71021ef
commit 66179f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/main.test.ts b/main.test.ts
@@ -1,6 +1,6 @@
 // Copyright 2024 Im-Beast. All rights reserved. MIT license.
 import { env, test } from "@beast/compat";
-import { assert, assertEquals, assertThrows } from "@std/assert";
+import { assertEquals, assertThrows } from "@std/assert";
 
 import crayon from "@crayon/crayon";
 import "./main.ts";
@@ -12,10 +12,15 @@ test.ignoreIf(!NO_COLOR)("NO_COLOR Literal", () => {
 });
 
 test.ignoreIf(NO_COLOR)("Literal", () => {
-  assert(crayon`{red {bold Hello} world!}`.endsWith("\x1b[0m"));
   assertEquals(
     crayon`{red {bold Hello} world!}`,
-    "\x1b[31m\x1b[1mHello\x1b[0m\x1b[31m world!\x1b[0m",
+    crayon.red(`${crayon.bold("Hello")} world!`),
+    "Output of @crayon/literal differs from @crayon/crayon",
+  );
+
+  assertEquals(
+    crayon`{red {bold Hello} world!}`,
+    "\x1b[31m\x1b[1mHello\x1b[0m\x1b[31m world!\x1b[0m\x1b[0m",
   );
 
   const styledText = "{rgb(255,0,17) methods {bgRgb(127,255,0) work!}}";
@@ -26,7 +31,13 @@ test.ignoreIf(NO_COLOR)("Literal", () => {
 
   assertEquals(
     crayon`{rgb(255,0,17) methods {bgRgb(127,255,0) work!}}`,
-    "\x1b[38;2;255;0;17mmethods \x1b[48;2;127;255;0mwork!\x1b[0m\x1b[38;2;255;0;17m\x1b[0m",
+    crayon.rgb(255, 0, 17)(`methods ${crayon.bgRgb(127, 255, 0)("work!")}`),
+    "Output of @crayon/literal differs from @crayon/crayon",
+  );
+
+  assertEquals(
+    crayon`{rgb(255,0,17) methods {bgRgb(127,255,0) work!}}`,
+    "\x1b[38;2;255;0;17mmethods \x1b[48;2;127;255;0mwork!\x1b[0m\x1b[38;2;255;0;17m\x1b[0m\x1b[0m",
   );
 });
 

diff --git a/main.ts b/main.ts
@@ -98,8 +98,8 @@ export function literal(
       styleBuffer += parsedStyle;
     }
 
-    const matchedText = replaceAll(body, "\x1b[0m", "\x1b[0m" + styleBuffer);
-    text = replace(text, section, styleBuffer + matchedText + "\x1b[0m");
+    const matchedText = replaceAll(body, "\x1b[0m\x1b[0m", "\x1b[0m" + styleBuffer);
+    text = replace(text, section, styleBuffer + matchedText + "\x1b[0m\x1b[0m");
 
     matches = text.match(literalStyleRegex);
   }