Merge branch 'main' into sourcemap-mappings

CHANGELOG.md

@@ -1,5 +1,11 @@
 # esrap changelog
 
+## 1.4.1
+
+### Patch Changes
+
+- 10c6156: fix: escape newlines when quoting strings
+
 ## 1.4.0
 
 ### Minor Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",

src/handlers.js

@@ -115,7 +115,26 @@ function prepend_comments(comments, state, newlines) {
  * @param {'\'' | '"'} char
  */
 function quote(string, char) {
-	return char + string.replaceAll(char, '\\' + char) + char;
+	let out = char;
+	let escaped = false;
+
+	for (const c of string) {
+		if (escaped) {
+			out += c;
+			escaped = false;
+		} else if (c === '\\') {
+			out += '\\\\';
+			escaped = true;
+		} else if (c === char) {
+			out += '\\' + c;
+		} else if (c === '\n') {
+			out += '\\n';
+		} else {
+			out += c;
+		}
+	}
+
+	return out + char;
 }
 
 const OPERATOR_PRECEDENCE = {

test/quotes.test.js

@@ -61,3 +61,35 @@ test('escape double quotes if present in string literal', () => {
 
 	expect(code).toMatchInlineSnapshot(`"const foo = "b\\"ar";"`);
 });
+
+test('escapes new lines', () => {
+	const ast = load('const str = "a\\nb"');
+	clean(ast);
+	const code = print(ast).code;
+
+	expect(code).toMatchInlineSnapshot(`"const str = 'a\\nb';"`);
+});
+
+test('escapes escape characters', () => {
+	const ast = load('const str = "a\\\\nb"');
+	clean(ast);
+	const code = print(ast).code;
+
+	expect(code).toMatchInlineSnapshot(`"const str = 'a\\\\nb';"`);
+});
+
+test('does not escape already-escaped single quotes', () => {
+	const ast = load(`const str = 'a\\'b'`);
+	clean(ast);
+	const code = print(ast).code;
+
+	expect(code).toMatchInlineSnapshot(`"const str = 'a\\'b';"`);
+});
+
+test('does not escape already-escaped double quotes', () => {
+	const ast = load('const str = "a\\"b"');
+	clean(ast);
+	const code = print(ast).code;
+
+	expect(code).toMatchInlineSnapshot(`"const str = 'a"b';"`);
+});