Fix fails on ES6 method syntax in ClientFunction arguments (closes De…

…vExpress#1279)
inikulin · Mar 1, 2017 · 404633b · 404633b
1 parent cd54490
commit 404633b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/compiler/es-next/compile-client-function.js b/src/compiler/es-next/compile-client-function.js
@@ -7,6 +7,7 @@ import { ClientFunctionAPIError } from '../../errors/runtime';
 import MESSAGE from '../../errors/runtime/message';
 
 const ANONYMOUS_FN_RE                = /^function\*?\s*\(/;
+const ES6_OBJ_METHOD_NAME_RE         = /^([A-Za-z\*\$]+)\s*\(/;
 const USE_STRICT_RE                  = /^('|")use strict('|");?/;
 const TRAILING_SEMICOLON_RE          = /;\s*$/;
 const REGENERATOR_FOOTPRINTS_RE      = /(_index\d+\.default|_regenerator\d+\.default|regeneratorRuntime)\.wrap\(function _callee\$\(_context\)/;
@@ -104,12 +105,25 @@ function getDependenciesDefinition (dependencies) {
         }, '');
 }
 
+function makeFnCodeSuitableForParsing (fnCode) {
+    // NOTE: 'function() {}' -> '(function() {})'
+    if (ANONYMOUS_FN_RE.test(fnCode))
+        return `(${fnCode})`;
+
+    // NOTE: 'myFn () {}' -> 'function myFn() {}'
+    var match = fnCode.match(ES6_OBJ_METHOD_NAME_RE);
+
+    if (match && match[1] !== 'function')
+        return `function ${fnCode}`;
+
+    return fnCode;
+}
+
 export default function compileClientFunction (fnCode, dependencies, instantiationCallsiteName, compilationCallsiteName) {
     if (fnCode === ASYNC_TO_GENERATOR_OUTPUT_CODE)
         throw new ClientFunctionAPIError(compilationCallsiteName, instantiationCallsiteName, MESSAGE.regeneratorInClientFunctionCode);
 
-    if (ANONYMOUS_FN_RE.test(fnCode))
-        fnCode = `(${fnCode})`;
+    fnCode = makeFnCodeSuitableForParsing(fnCode);
 
     // NOTE: we need to recompile ES6 code for the browser if we are on newer versions of Node.
     if (NODE_VER >= 4)

diff --git a/test/server/compiler-test.js b/test/server/compiler-test.js
@@ -253,6 +253,12 @@ describe('Compiler', function () {
         it('Should polyfill Babel `typeof` artifacts', function () {
             return testClientFnCompilation('typeof');
         });
+
+        describe('Regression', function () {
+            it('Should compile ES6 object method (GH-1279)', function () {
+                return testClientFnCompilation('gh1279');
+            });
+        });
     });
 
     describe('Errors', function () {

diff --git a/test/server/data/client-fn-compilation/gh1279/expected.js b/test/server/data/client-fn-compilation/gh1279/expected.js
@@ -0,0 +1,5 @@
+(function () {
+    return function fn () {
+        return true;
+    };
+})();
diff --git a/test/server/data/client-fn-compilation/gh1279/testfile.js b/test/server/data/client-fn-compilation/gh1279/testfile.js
@@ -0,0 +1,17 @@
+import compileClientFunction from '../../../../../lib/compiler/es-next/compile-client-function';
+
+fixture `Fixture`;
+
+function compile (fn) {
+    return compileClientFunction(fn.toString());
+}
+
+test('Test', () => {
+    var obj = {
+        fn() {
+            return true;
+        }
+    };
+
+    return compile(obj.fn);
+});