Fixed a bug with marshalling strings that contains the word function.

Author: wessberg

README.md

@@ -53,6 +53,10 @@ The marshalled version of the input data.
 
 ## Changelog:
 
+**v1.11.0**:
+
+- Fixed a bug with marshalling strings that contains the word "function".
+
 **v1.10.0**:
 
 - The Marshaller can no marshal to objects if that is the most probable type, even if a hint is not given.

src/Marshaller.ts

@@ -7,9 +7,9 @@ import {ITypeDetector, IArbitraryObject} from "@wessberg/typedetector";
  */
 export class Marshaller implements IMarshaller {
 	private static readonly SYMBOL_REGEX: RegExp = /Symbol\(([^)]*)\)/;
-	private static readonly FUNCTION_REGEX_1: RegExp = /function\s*\w*\s*\([^)]*\)\s*{/;
-	private static readonly FUNCTION_REGEX_2: RegExp = /\([^)]*\)\s*=>/;
-	private static readonly FUNCTION_REGEX_3: RegExp = /\w+\s*=>/;
+	private static readonly FUNCTION_REGEX_1: RegExp = /^function\s*\w*\s*\([^)]*\)\s*{/;
+	private static readonly FUNCTION_REGEX_2: RegExp = /^\([^)]*\)\s*=>/;
+	private static readonly FUNCTION_REGEX_3: RegExp = /^\w+\s*=>/;
 
 	constructor (private typeDetector: ITypeDetector) {}
 
@@ -256,9 +256,9 @@ export class Marshaller implements IMarshaller {
 	 * @returns {Function}
 	 */
 	private marshalStringToFunction (data: string): Function {
-		if (Marshaller.FUNCTION_REGEX_1.test(data)) return new Function(`return ${data}`)();
-		if (Marshaller.FUNCTION_REGEX_2.test(data)) return new Function(`return ${data}`)();
-		if (Marshaller.FUNCTION_REGEX_3.test(data)) return new Function(`return ${data}`)();
+		if (Marshaller.FUNCTION_REGEX_1.test(data.trim())) return new Function(`return ${data}`)();
+		if (Marshaller.FUNCTION_REGEX_2.test(data.trim())) return new Function(`return ${data}`)();
+		if (Marshaller.FUNCTION_REGEX_3.test(data.trim())) return new Function(`return ${data}`)();
 		return () => data;
 	}
 
@@ -968,9 +968,9 @@ export class Marshaller implements IMarshaller {
 		const asObj = this.attemptStringToObjectConversion(primitive);
 		if (asObj != null) return asObj;
 
-		if (Marshaller.FUNCTION_REGEX_1.test(primitive)) return new Function(`return ${primitive}`)();
-		if (Marshaller.FUNCTION_REGEX_2.test(primitive)) return new Function(`return ${primitive}`)();
-		if (Marshaller.FUNCTION_REGEX_3.test(primitive)) return new Function(`return ${primitive}`)();
+		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}`)();
 
 		try {
 			return JSON.parse(primitive);

test/Marshaller.test.ts

@@ -138,6 +138,42 @@ test(`'marshal()' string -> best guess. #2`, t => {
 	t.true(typeDetector.isObject(marshaller.marshal(input)));
 });
 
+test(`'marshal()' string -> best guess. #3`, t => {
+	const input = `() => {}`;
+	const expected = () => {};
+
+	const marshalled = marshaller.marshal(input);
+	if (marshalled == null) t.fail();
+	else t.deepEqual(marshalled.toString(), expected.toString());
+});
+
+test(`'marshal()' string -> best guess. #4`, t => {
+	const input = `function () {}`;
+	const expected = function () {};
+
+	const marshalled = marshaller.marshal(input);
+	if (marshalled == null) t.fail();
+	else t.deepEqual(marshalled.toString(), expected.toString());
+});
+
+test(`'marshal()' string -> best guess. #5`, t => {
+	const input = `hellofunction () {}`;
+	const expected = input;
+
+	const marshalled = marshaller.marshal(input);
+	if (marshalled == null) t.fail();
+	else t.deepEqual(marshalled.toString(), expected.toString());
+});
+
+test(`'marshal()' string -> best guess. #4`, t => {
+	const input = `hello() => {}`;
+	const expected = input;
+
+	const marshalled = marshaller.marshal(input);
+	if (marshalled == null) t.fail();
+	else t.deepEqual(marshalled.toString(), expected.toString());
+});
+
 
 test(`'marshal()' object -> string. #1`, t => {
 	const expected = '{"a": 2}';