Skip to content

Fix custom function details parsing #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2018
Merged

Fix custom function details parsing #709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,18 +248,22 @@ export function getCustomComponentDefinitionDetails (def) {

export function getCustomFunctionDetails (func) {
let string = ''
let matches = null
try {
string = Function.prototype.toString.call(func)
matches = String.prototype.match.call(string, /\([\s\S]*?\)/)
} catch (e) {
// Func is probably a Proxy, which can break Function.prototype.toString()
}
const matches = string.match(/\([\s\S]*?\)/)
// Trim any excess whitespace from the argument string
const args = matches ? `(${matches[0].substr(1, matches[0].length - 2).split(',').map(a => a.trim()).join(', ')})` : '(?)'
const match = matches && matches[0]
const args = typeof match === 'string'
? `(${match.substr(1, match.length - 2).split(',').map(a => a.trim()).join(', ')})` : '(?)'
const name = typeof func.name === 'string' ? func.name : ''
return {
_custom: {
type: 'function',
display: `<span>ƒ</span> ${escape(func.name)}${args}`
display: `<span>ƒ</span> ${escape(name)}${args}`
}
}
}
Expand Down