-
-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Support ES2015+ function definitions in
function#toStringTokens()
Additionally revert from problematic regex based implementation. Addresses #21
- Loading branch information
Showing
3 changed files
with
54 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) }; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters