Marshalling objects to string no longer uses JSON.stringify. Rather, it tries to correctly format the object as close to native as possible.

Author: wessberg

README.md

@@ -52,6 +52,10 @@ The marshalled version of the input data.
 
 ## Changelog:
 
+**v1.0.7**:
+
+- Marshalling objects to string no longer uses JSON.stringify. Rather, it tries to correctly format the object as close to native as possible.
+
 **v1.0.6**:
 
 - Added marshalling to/from `function`.

src/Marshaller.ts

@@ -66,13 +66,47 @@ export class Marshaller implements IMarshaller {
 		return () => data;
 	}
 
+	/**
+	 * 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
+	 * @returns {string}
+	 */
+	private quoteIfNecessary (content: string): string {
+		if (!(typeof content === "string")) return content;
+		const firstChar = content[0];
+		const lastChar = content[content.length - 1];
+		let str = "`";
+		const startsWithClashingQuote = firstChar === "`";
+		const endsWithClashingQuote = lastChar === "`";
+		const startOffset = startsWithClashingQuote ? 1 : 0;
+		const endOffset = endsWithClashingQuote ? 1 : 0;
+		if (startsWithClashingQuote) str += "\`";
+		str += content.slice(startOffset, content.length - endOffset);
+		if (endsWithClashingQuote) str += "\`";
+		str += "`";
+		return str;
+	}
+
 	/**
 	 * Marshals an object into a string.
 	 * @param {object} data
 	 * @returns {string}
 	 */
 	private marshalObjectToString<T> (data: { [key: string]: T }): string {
-		return JSON.stringify(data);
+		let str = "{";
+		const space = " ";
+		const keys = Object.keys(data);
+		keys.forEach((key, index) => {
+			str += `"${key}":${space}`;
+			const value = data[key];
+			const isString = typeof this.marshal(value) === "string";
+			const marshalled = this.marshalToString(value);
+			str += isString ? this.quoteIfNecessary(<string>marshalled) : marshalled;
+			if (index !== keys.length - 1) str += `,${space}`;
+		});
+		str += "}";
+		return str;
+		// return JSON.stringify(data);
 	}
 
 	/**
@@ -531,6 +565,7 @@ export class Marshaller implements IMarshaller {
 				let trimmed = primitive
 					.replace(/([{,:}"\]])([ \t\r\n]*)/g, (_, p1) => `${p1}`)
 					.replace(/([{,])(\w+)(:)/g, (_, p1, p2, p3) => `${p1}"${p2}"${p3}`)
+					.replace(/`([^`]*)`/g, (_, p1) => `"${p1}"`)
 					.trim();
 				if (trimmed.endsWith(";")) trimmed = trimmed.slice(0, trimmed.length - 1);
 				return this.marshalStringToObject(trimmed, ++attempt);

test/Marshaller.test.ts

@@ -129,4 +129,61 @@ test(`'marshal()' string -> best guess. #1`, t => {
 	const input = `"1"`;
 
 	t.deepEqual<Object|null|undefined>(marshaller.marshal(input), expected);
+});
+
+test(`'marshal()' object -> string. #1`, t => {
+	const expected = '{"a": 2}';
+	const input = {
+		a: 2
+	};
+
+	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
+});
+
+test(`'marshal()' object -> string. #2`, t => {
+	const expected = '{"a": 2, "b": () => {}}';
+	const input = {
+		a: 2,
+		b: () => {}
+	};
+
+	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
+});
+
+test(`'marshal()' object -> string. #3`, t => {
+	const expected = '{"c": {"d": `hello sir!`}}';
+	const input = {
+		c: {
+			d: "hello sir!"
+		}
+	};
+
+	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
+});
+
+test(`'marshal()' object -> string. #4`, t => {
+	const expected = '{"foo": false, "type": {"expression": `hello`}}';
+	const foo = false;
+	const exp = "hello";
+	const input = {
+		foo,
+		type: {
+			expression: exp
+		}
+	};
+
+	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
+});
+
+test(`'marshal()' string -> object. #1`, t => {
+	const expected = {
+		foo: false,
+		type: {
+			expression: "hello"
+		}
+	};
+
+	const input = '{"foo": false, "type": {"expression": `hello`}}';
+
+	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, expected), expected);
 });