update, text, response

node_modules/es5-ext/function/#/copy.js

@@ -1,19 +1,20 @@
 "use strict";
 
 var mixin         = require("../../object/mixin")
-  , validFunction = require("../valid-function")
-  , re            = /^\s*function\s*([\0-')-\uffff]+)*\s*\(([\0-(*-\uffff]*)\)\s*\{/;
+  , validFunction = require("../valid-function");
 
 module.exports = function () {
-	var match = String(validFunction(this)).match(re), fn;
+	validFunction(this);
 
+	var args = [];
+	for (var i = 0; i < this.length; ++i) args.push("arg" + (i + 1));
 	// eslint-disable-next-line no-new-func
-	fn = new Function(
+	var fn = new Function(
 		"fn",
 		"return function " +
-			match[1].trim() +
+			(this.name || "") +
 			"(" +
-			match[2] +
+			args.join(", ") +
 			") { return fn.apply(this, arguments); };"
 	)(this);
 	try { mixin(fn, this); }

node_modules/es5-ext/function/#/to-string-tokens.js

@@ -1,17 +1,52 @@
 "use strict";
 
-var validFunction = require("../valid-function");
+var isValue       = require("../../object/is-value")
+  , esniff        = require("esniff")
+  , validFunction = require("../valid-function");
 
-var re1 = /^\s*function[\0-')-\uffff]*\(([\0-(*-\uffff]*)\)\s*\{([\0-\uffff]*)\}\s*$/
-  , re2 = /^\s*\(?([\0-'*-\uffff]*)\)?\s*=>\s*(\{?[\0-\uffff]*\}?)\s*$/;
+var classRe = /^\s*class[\s{/}]/;
 
 module.exports = function () {
-	var str = String(validFunction(this)), data = str.match(re1);
-	if (!data) {
-		data = str.match(re2);
-		if (!data) throw new Error("Unrecognized string format");
-		data[1] = data[1].trim();
-		if (data[2][0] === "{") data[2] = data[2].trim().slice(1, -1);
-	}
-	return { args: data[1], body: data[2] };
+	var str = String(validFunction(this));
+	if (classRe.test(str)) throw new Error("Class methods are not supported");
+
+	var argsStartIndex
+	  , argsEndIndex
+	  , bodyStartIndex
+	  , bodyEndReverseIndex = -1
+	  , shouldTrimArgs = false;
+
+	esniff(str, function (emitter, accessor) {
+		emitter.once("trigger:(", function () { argsStartIndex = accessor.index + 1; });
+		emitter.once("trigger:=", function () {
+			if (isValue(argsStartIndex)) return;
+			argsStartIndex = 0;
+			argsEndIndex = accessor.index;
+			shouldTrimArgs = true;
+			if (!accessor.skipCodePart("=>")) {
+				throw new Error("Unexpected function string: " + str);
+			}
+			accessor.skipWhitespace();
+			if (!accessor.skipCodePart("{")) bodyEndReverseIndex = Infinity;
+			bodyStartIndex = accessor.index;
+		});
+		emitter.on("trigger:)", function () {
+			if (accessor.scopeDepth) return;
+			argsEndIndex = accessor.index;
+			accessor.skipCodePart(")");
+			accessor.skipWhitespace();
+			if (accessor.skipCodePart("=>")) {
+				accessor.skipWhitespace();
+				if (!accessor.skipCodePart("{")) bodyEndReverseIndex = Infinity;
+			} else if (!accessor.skipCodePart("{")) {
+				throw new Error("Unexpected function string: " + str);
+			}
+			bodyStartIndex = accessor.index;
+			accessor.stop();
+		});
+	});
+
+	var argsString = str.slice(argsStartIndex, argsEndIndex);
+	if (shouldTrimArgs) argsString = argsString.trim();
+	return { args: argsString, body: str.slice(bodyStartIndex, bodyEndReverseIndex) };
 };