prevent forEach methods from hoisting early returns, instead just c…

…onverting to `continue` statements (#33)

__tests__/__fixtures__/complex/for-each-early-return/code.js

@@ -0,0 +1,12 @@
+const { forEach } = require('../../../../src/inline-loops.macro');
+import { log } from './log';
+
+function logItems(items) {
+ forEach(items, (item) => {
+ if (!item.position) {
+ return;
+ }
+
+ log(item);
+ });
+}

__tests__/__fixtures__/complex/for-each-early-return/output.js

@@ -0,0 +1,10 @@
+import { log } from './log';
+function logItems(items) {
+ for (let _key = 0, _length = items.length, _item; _key < _length; ++_key) {
+ _item = items[_key];
+ if (!_item.position) {
+ continue;
+ }
+ log(_item);
+ }
+}

__tests__/__fixtures__/complex/for-each-hoisted/code.js

@@ -3,7 +3,7 @@ import { log } from './log';
 
 function logItems(items) {
  forEach(items, (item) => {
- if (!item.position) {
+ if (!this.position) {
  return;
  }
 

__tests__/__fixtures__/complex/for-each-hoisted/output.js

@@ -2,7 +2,7 @@ import { log } from './log';
 function logItems(items) {
  (() => {
  const _fn = (_item) => {
- if (!_item.position) {
+ if (!this.position) {
  return;
  }
  log(_item);

__tests__/__fixtures__/complex/for-each-right-early-return/code.js

@@ -0,0 +1,12 @@
+const { forEachRight } = require('../../../../src/inline-loops.macro');
+import { log } from './log';
+
+function logItems(items) {
+ forEachRight(items, (item) => {
+ if (!item.position) {
+ return;
+ }
+
+ log(item);
+ });
+}

__tests__/__fixtures__/complex/for-each-right-early-return/output.js

@@ -0,0 +1,10 @@
+import { log } from './log';
+function logItems(items) {
+ for (let _key = items.length, _item; --_key >= 0; ) {
+ _item = items[_key];
+ if (!_item.position) {
+ continue;
+ }
+ log(_item);
+ }
+}

__tests__/__fixtures__/complex/for-each-right-hoisted/code.js

@@ -3,7 +3,7 @@ import { log } from './log';
 
 function logItems(items) {
  forEachRight(items, (item) => {
- if (!item.position) {
+ if (!this.position) {
  return;
  }
 

__tests__/__fixtures__/complex/for-each-right-hoisted/output.js

@@ -2,7 +2,7 @@ import { log } from './log';
 function logItems(items) {
  (() => {
  const _fn = (_item) => {
- if (!_item.position) {
+ if (!this.position) {
  return;
  }
  log(_item);

src/handlers.ts

@@ -91,6 +91,15 @@ export function createHandlers(babel: MacroParams['babel']) {
 
  if (body.isBlockStatement()) {
  if (!callbackContainsThis) {
+ if (isForEach) {
+ body.traverse(traverseConfigs.stripReturn, { isForEach });
+
+ return {
+ injectedBody: body.node.body,
+ returned: t.identifier('undefined'),
+ };
+ }
+
  if (returnCount < 2) {
  body.traverse(traverseConfigs.stripReturn, { isForEach });
  }