fix(utils): serialize inline functions (#5051) (#5580)

This commit is contained in:
Jonas Galvez 2019-04-22 15:47:42 -03:00 committed by Pooya Parsa
parent 46cc8deaf9
commit 88a78ffa58
2 changed files with 81 additions and 1 deletions

View File

@ -1,7 +1,37 @@
import serialize from 'serialize-javascript' import serialize from 'serialize-javascript'
export function normalizeFunctions(obj) {
if (typeof obj !== 'object' || Array.isArray(obj) || obj === null) {
return obj
}
for (const key in obj) {
if (key === '__proto__' || key === 'constructor') {
continue
}
const val = obj[key]
if (val !== null && typeof val === 'object' && !Array.isArray(obj)) {
obj[key] = normalizeFunctions(val)
}
if (typeof obj[key] === 'function') {
const asString = obj[key].toString()
const match = asString.match(/^([^{(]+)=>\s*(.*)/s)
if (match) {
const fullFunctionBody = match[2].match(/^{?(\s*return\s+)?(.*?)}?$/s)
let functionBody = fullFunctionBody[2].trim()
if (fullFunctionBody[1] || !match[2].trim().match(/^\s*{/s)) {
functionBody = `return ${functionBody}`
}
// eslint-disable-next-line no-new-func
obj[key] = new Function(...match[1].split(',').map(arg => arg.trim()), functionBody)
}
}
}
return obj
}
export function serializeFunction(func) { export function serializeFunction(func) {
let open = false let open = false
func = normalizeFunctions(func)
return serialize(func) return serialize(func)
.replace(serializeFunction.assignmentRE, (_, spaces) => { .replace(serializeFunction.assignmentRE, (_, spaces) => {
return `${spaces}: function (` return `${spaces}: function (`

View File

@ -1,6 +1,29 @@
import { serializeFunction } from '../src/serialize' import { serializeFunction, normalizeFunctions } from '../src/serialize'
describe('util: serialize', () => { describe('util: serialize', () => {
test('should normalize arrow functions', () => {
const obj = {
// eslint-disable-next-line arrow-parens
fn1: foobar => {},
fn2: foobar => 1,
// eslint-disable-next-line arrow-parens
fn3: foobar => {
return 3
},
// eslint-disable-next-line arrow-parens
fn4: arg1 =>
2 * arg1
}
expect(normalizeFunctions(obj).fn1.toString())
.toEqual('function anonymous(foobar\n) {\n\n}')
expect(normalizeFunctions(obj).fn2.toString())
.toEqual('function anonymous(foobar\n) {\nreturn 1\n}')
expect(normalizeFunctions(obj).fn3.toString())
.toEqual('function anonymous(foobar\n) {\nreturn 3;\n}')
expect(normalizeFunctions(obj).fn4.toString())
.toEqual('function anonymous(arg1\n) {\nreturn 2 * arg1\n}')
})
test('should serialize normal function', () => { test('should serialize normal function', () => {
const obj = { const obj = {
fn: function () {} fn: function () {}
@ -22,6 +45,33 @@ describe('util: serialize', () => {
expect(serializeFunction(obj.fn)).toEqual('() => {}') expect(serializeFunction(obj.fn)).toEqual('() => {}')
}) })
test('should serialize arrow function with ternary in parens', () => {
const obj = {
// eslint-disable-next-line arrow-parens
fn: foobar => (foobar ? 1 : 0)
}
expect(serializeFunction(obj.fn)).toEqual('foobar => foobar ? 1 : 0')
})
test('should serialize arrow function with single parameter', () => {
const obj = {
// eslint-disable-next-line arrow-parens
fn1: foobar => {},
fn2: foobar => 1,
// eslint-disable-next-line arrow-parens
fn3: foobar => {
return 3
},
// eslint-disable-next-line arrow-parens
fn4: arg1 =>
2 * arg1
}
expect(serializeFunction(obj.fn1)).toEqual('foobar => {}')
expect(serializeFunction(obj.fn2)).toEqual('foobar => 1')
expect(serializeFunction(obj.fn3)).toEqual('foobar => {\n return 3;\n }')
expect(serializeFunction(obj.fn4)).toEqual('arg1 => 2 * arg1')
})
test('should not replace custom scripts', () => { test('should not replace custom scripts', () => {
const obj = { const obj = {
fn() { fn() {