Merge pull request #12 from hyperz111/handle-newline

Author: usmanyunusov

index.browser.js

@@ -1,7 +1,7 @@
 function createColorize(colors = {}) {
   let MARKS = Object.keys(colors).toString().replace(/,/g, '|')
   let RE_BLOCK = new RegExp(
-    `\\{((?:${MARKS})(?:\\.(?:${MARKS}))*?)\\s|(\\})|(.[^{}]*)`,
+    `\\{((?:${MARKS})(?:\\.(?:${MARKS}))*?)\\s|(\\})|([\\s\\S][^{}]*)`,
     'gi'
   )
 

index.js

@@ -1,7 +1,7 @@
 function createColorize(colors = {}) {
   let MARKS = Object.keys(colors).toString().replace(/,/g, '|')
   let RE_BLOCK = new RegExp(
-    `\\{((?:${MARKS})(?:\\.(?:${MARKS}))*?)\\s|(\\})|(.[^{}]*)`,
+    `\\{((?:${MARKS})(?:\\.(?:${MARKS}))*?)\\s|(\\})|([\\s\\S][^{}]*)`,
     'gi'
   )
 

tests/browser.js

@@ -78,6 +78,10 @@ test('correctly parse escape in parameters', () => {
   assert.equal(colorize`{red ${string}}`, '\\')
 })
 
+test('correctly parse newline escapes after template', () => {
+  assert.equal(colorize`Hello {red there}\nafter`, 'Hello there\nafter')
+})
+
 test('correctly parses unicode/hex escapes', () => {
   assert.equal(
     colorize`\u0078ylophones are fo\x78y! {magenta.inverse \u0078ylophones are fo\x78y!}`,

tests/index.js

@@ -80,6 +80,10 @@ test('correctly parse newline escapes', () => {
   assert.equal(colorize`Hello\nthere!`, 'Hello\nthere!')
 })
 
+test('correctly parse newline escapes after template', () => {
+  assert.equal(colorize`Hello {red there}\nafter`, 'Hello ' + pc.red('there') + '\nafter')
+})
+
 test('correctly parse escape in parameters', () => {
   const string = '\\'
   assert.equal(colorize`{red ${string}}`, pc.red('\\'))