Switched to for marshalling strings to objects.

Author: wessberg

README.md

@@ -53,6 +53,10 @@ The marshalled version of the input data.
 
 ## Changelog:
 
+**v1.12.0**:
+
+- Switched to `new Function()` for marshalling strings to objects.
+
 **v1.11.0**:
 
 - Fixed a bug with marshalling strings that contains the word "function".

src/Marshaller.ts

@@ -965,13 +965,13 @@ export class Marshaller implements IMarshaller {
 			return toNum;
 		}
 
-		const asObj = this.attemptStringToObjectConversion(primitive);
-		if (asObj != null) return asObj;
-
 		if (Marshaller.FUNCTION_REGEX_1.test(primitive.trim())) return new Function(`return ${primitive}`)();
 		if (Marshaller.FUNCTION_REGEX_2.test(primitive.trim())) return new Function(`return ${primitive}`)();
 		if (Marshaller.FUNCTION_REGEX_3.test(primitive.trim())) return new Function(`return ${primitive}`)();
 
+		const asObj = this.attemptStringToObjectConversion(primitive);
+		if (asObj != null) return asObj;
+
 		try {
 			return JSON.parse(primitive);
 		} catch (e) {
@@ -1022,25 +1022,19 @@ export class Marshaller implements IMarshaller {
 	/**
 	 * Attempts to convert a string into a regular object. Returns null if it fails.
 	 * @param {string} primitive
-	 * @param {number} [attempt=0]
 	 * @returns {object|null}
 	 */
-	private attemptStringToObjectConversion (primitive: string, attempt: number = 0): {[key: string]: string}|null {
+	private attemptStringToObjectConversion (primitive: string): {[key: string]: string}|null {
 		try {
 			return JSON.parse(primitive);
 		} catch (e) {
-
-			if (attempt === 0) {
-				// Try to format the string so it fits the JSON standard.
-				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.attemptStringToObjectConversion(trimmed, ++attempt);
+			try {
+				const evaluated = new Function(`return (${primitive})`)();
+				if (this.typeDetector.isObject(evaluated)) return <{[key: string]: string}>evaluated;
+				return null;
+			} catch (e) {
+				return null;
 			}
-			return null;
 		}
 	}
 

test/Marshaller.test.ts

@@ -28,18 +28,11 @@ test(`'marshal()' string -> object. #2`, t => {
 				c: "hello world!"
 			}
 		},
-		b: ["foo", "bar", true, false]
+		d: ["foo", "bar", true, false]
 	};
 
 	const input = `
-		{
-		a: {
-			b: {
-				c: "hello world!"
-			}
-		},
-		b: ["foo", "bar", true, false]
-	};
+		{a: {b: {c: "hello world!"}}, d: ["foo", "bar", true, false]}
 	`;
 
 	t.deepEqual<Object|null|undefined>(marshaller.marshal(input, Object), expected);
@@ -174,6 +167,14 @@ test(`'marshal()' string -> best guess. #4`, t => {
 	else t.deepEqual(marshalled.toString(), expected.toString());
 });
 
+test(`'marshal()' string -> best guess. #5`, t => {
+	const input = `{"hmm": ((arg) => { return (arg === undefined ? undefined : arg)+10;})}`;
+	// const expected = {"hmm": ((_) => { return (_ === undefined ? undefined : _)+10;})};
+
+	const marshalled = marshaller.marshal(input);
+	t.true(typeDetector.isObject(marshalled));
+});
+
 
 test(`'marshal()' object -> string. #1`, t => {
 	const expected = '{"a": 2}';