fix: #556 upgrade acorn, and handle function() {} syntax

dist/gpu-browser-core.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.4.4
- * @date Thu Jan 02 2020 12:26:36 GMT-0500 (Eastern Standard Time)
+ * @version 2.4.5
+ * @date Thu Jan 02 2020 13:02:31 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -14411,11 +14411,13 @@ const utils = {
  },
 
  getMinifySafeName: (fn) => {
- const ast = acorn.parse(fn.toString());
- if (!ast.body || !ast.body[0] || !ast.body[0].expression || !ast.body[0].expression.body || !ast.body[0].expression.body.name) {
- throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere`');
+ try {
+ const ast = acorn.parse(`const value = ${fn.toString()}`);
+ const { init } = ast.body[0].declarations[0];
+ return init.body.name || init.body.body[0].argument.name;
+ } catch (e) {
+ throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere` or function() { return yourFunctionVariableHere; }');
  }
- return ast.body[0].expression.body.name;
  }
 };
 

dist/gpu-browser.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.4.4
- * @date Thu Jan 02 2020 12:26:36 GMT-0500 (Eastern Standard Time)
+ * @version 2.4.5
+ * @date Thu Jan 02 2020 13:02:31 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -18845,11 +18845,13 @@ const utils = {
  },
 
  getMinifySafeName: (fn) => {
- const ast = acorn.parse(fn.toString());
- if (!ast.body || !ast.body[0] || !ast.body[0].expression || !ast.body[0].expression.body || !ast.body[0].expression.body.name) {
- throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere`');
+ try {
+ const ast = acorn.parse(`const value = ${fn.toString()}`);
+ const { init } = ast.body[0].declarations[0];
+ return init.body.name || init.body.body[0].argument.name;
+ } catch (e) {
+ throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere` or function() { return yourFunctionVariableHere; }');
  }
- return ast.body[0].expression.body.name;
  }
 };
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "gpu.js",
- "version": "2.4.4",
+ "version": "2.4.5",
  "description": "GPU Accelerated JavaScript",
  "engines": {
  "node": ">=8.0.0"

src/utils.js

@@ -1000,11 +1000,13 @@ const utils = {
  },
 
  getMinifySafeName: (fn) => {
- const ast = acorn.parse(fn.toString());
- if (!ast.body || !ast.body[0] || !ast.body[0].expression || !ast.body[0].expression.body || !ast.body[0].expression.body.name) {
- throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere`');
+ try {
+ const ast = acorn.parse(`const value = ${fn.toString()}`);
+ const { init } = ast.body[0].declarations[0];
+ return init.body.name || init.body.body[0].argument.name;
+ } catch (e) {
+ throw new Error('Unrecognized function type. Please use `() => yourFunctionVariableHere` or function() { return yourFunctionVariableHere; }');
  }
- return ast.body[0].expression.body.name;
  }
 };
 

test/internal/utils.js

@@ -609,14 +609,28 @@ test('flattenFunctionToString', () => {
  assert.ok(true);
 });
 
-test('improper getMinifySafeName usage', () => {
+test('improper getMinifySafeName usage with arrow function', () => {
  assert.throws(() => {
  utils.getMinifySafeName(() => {});
- });
+ }, 'Unrecognized function type.');
 });
 
-test('proper getMinifySafeName usage', () => {
+test('improper getMinifySafeName usage with regular function', () => {
+ assert.throws(() => {
+ utils.getMinifySafeName(function() {});
+ }, 'Unrecognized function type.');
+});
+
+test('proper getMinifySafeName usage with arrow function', () => {
  function n() {}
  const safeName = utils.getMinifySafeName(() => n);
  assert.equal(safeName, 'n');
+});
+
+test('proper getMinifySafeName usage with regular function', () => {
+ function n() {}
+ const safeName = utils.getMinifySafeName(function () {
+ return n;
+ });
+ assert.equal(safeName, 'n');
 });