Made sure that quoted strings will not be re-quoted.

Author: wessberg

README.md

@@ -56,6 +56,10 @@ The marshalled version of the input data.
 
 ## Changelog:
 
+**v1.0.21**:
+
+- Made sure that quoted strings will not be re-quoted. 
+
 **v1.0.20**:
 
 - Added marshalling to/from class instances and class constructors.

src/Marshaller.ts

@@ -1612,6 +1612,15 @@ export class Marshaller implements IMarshaller {
 		return this.marshalToString(data);
 	}
 
+	/**
+	 * Returns true if the given content is a quote.
+	 * @param {string} content
+	 * @returns {boolean}
+	 */
+	private isQuote (content: string): boolean {
+		return /["'`]/.test(content);
+	}
+
 	/**
 	 * Quotes the given string if needed. It will escape the string if it already starts and/or ends with a clashing quote.
 	 * @param {string} content
@@ -1621,6 +1630,7 @@ export class Marshaller implements IMarshaller {
 		if (!(typeof content === "string")) return content;
 		const firstChar = content[0];
 		const lastChar = content[content.length - 1];
+		if (this.isQuote(firstChar) && this.isQuote(lastChar)) return content;
 		let str = "`";
 		const startsWithClashingQuote = firstChar === "`";
 		const endsWithClashingQuote = lastChar === "`";

test/Marshaller.test.ts

@@ -273,7 +273,7 @@ test(`'marshal()' string -> object. #1`, t => {
 
 	const input = "{\"foo\": false, \"type\": {\"expression\": `hello`}}";
 
-	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
+	t.deepEqual(marshaller.marshal(input, expected), expected);
 });
 
 test(`'marshal()' class -> string. #1`, t => {