Fix CRLF handling in raw strings

Author: antonmedv

build/index.cjs

@@ -91,10 +91,20 @@ function parse(source) {
     if (ch !== "`") return;
     let str = "", more = !1;
     do {
-      for (; next(), !(ch === "\n" || done); )
+      let newline = "\n";
+      for (; ; ) {
+        if (next(), ch === "\r")
+          if (next(), ch === "\n") {
+            newline = "\r\n";
+            break;
+          } else
+            str += "\r";
+        else if (ch === "\n" || done)
+          break;
         str += ch;
+      }
       for (next(); isWhitespace(ch); ) next();
-      more = ch === "`", more && (str += "\n");
+      more = ch === "`", more && (str += newline);
     } while (more);
     return str;
   }

build/index.js

@@ -110,18 +110,31 @@ export function parse(source: string): any {
 
   function parseRawString() {
     if (ch !== '`') return
-    let str = '',
-      more = false
+    let str = ''
+    let more = false
     do {
+      let newline = '\n'
       while (true) {
         next()
-        if ((ch as string) === '\n' || done) break
+        if ((ch as string) === '\r') {
+          next()
+          if ((ch as string) === '\n') {
+            newline = '\r\n'
+            break
+          } else {
+            str += '\r'
+          }
+        } else if ((ch as string) === '\n' || done) {
+          break
+        }
         str += ch
       }
       next()
       while (isWhitespace(ch)) next()
       more = (ch as string) === '`'
-      if (more) str += '\n'
+      if (more) {
+        str += newline
+      }
     } while (more)
     return str
   }

build/maml.min.js

@@ -69,4 +69,29 @@ describe('extra', () => {
     const output = parse('` ')
     expect(output).toStrictEqual(' ')
   })
+
+  test('raw string with CRLF newlines', () => {
+    const output = parse('`line1\r\n`line2\r\n`line3')
+    expect(output).toStrictEqual('line1\r\nline2\r\nline3')
+  })
+
+  test('raw string with mixed CRLF and LF newlines', () => {
+    const output = parse('`line1\r\n`line2\n`line3\r\n`')
+    expect(output).toStrictEqual('line1\r\nline2\nline3\r\n')
+  })
+
+  test('single-line raw string with CRLF newline', () => {
+    const output = parse('`simgle line\r\n')
+    expect(output).toStrictEqual('simgle line')
+  })
+
+  test('single-line raw string with CR inside and CRLF newline', () => {
+    const output = parse('`the \r char\r\n')
+    expect(output).toStrictEqual('the \r char')
+  })
+
+  test('single-line raw string with CR at the end', () => {
+    const output = parse('`string\r')
+    expect(output).toStrictEqual('string\r')
+  })
 })