fix(es/preset-env): Fix pass ordering (#7434)

**Related issue:**

 - Closes #6898.
 - Closes #7432.

Author: kdy1

crates/swc/tests/exec/issues-6xxx/6898/1/.swcrc

@@ -0,0 +1,16 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "ecmascript"
+        },
+        "target": "es5",
+        "minify": {
+            "compress": false,
+            "mangle": false
+        }
+    },
+    "env": {
+        "targets": "chrome 30"
+    },
+    "minify": false
+}

crates/swc/tests/exec/issues-6xxx/6898/1/exec.js

@@ -0,0 +1,15 @@
+(async () => {
+    const arr = [
+        'value1',
+        'value2',
+        'value3',
+    ];
+
+    // for (const value of arr) {
+    for (let i = 0; i < arr.length; i++) {
+        const value = arr[i];
+        setTimeout(() => {
+            console.log('value', value);
+        }, 0);
+    }
+})();

crates/swc/tests/exec/issues-7xxx/7432/1/.swcrc

@@ -0,0 +1,16 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "ecmascript"
+        },
+        "target": "es5",
+        "minify": {
+            "compress": false,
+            "mangle": false
+        }
+    },
+    "env": {
+        "targets": "chrome 30"
+    },
+    "minify": false
+}

crates/swc/tests/exec/issues-7xxx/7432/1/exec.js

@@ -0,0 +1,7 @@
+(async () => {
+    const array = [1, 2, 3]
+    for (const el of array)
+        setTimeout(() => {
+            console.log(el)
+        }, 1)
+})()

crates/swc/tests/fixture/issues-6xxx/6898/input/exec.js

@@ -0,0 +1,15 @@
+(async () => {
+    const arr = [
+        'value1',
+        'value2',
+        'value3',
+    ];
+
+    // for (const value of arr) {
+    for (let i = 0; i < arr.length; i++) {
+        const value = arr[i];
+        setTimeout(() => {
+            console.log('value', value);
+        }, 0);
+    }
+})();

crates/swc/tests/fixture/issues-6xxx/6898/output/exec.js

@@ -0,0 +1,23 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+_async_to_generator(function() {
+    var _loop, arr, i;
+    return _ts_generator(this, function(_state) {
+        _loop = function(i) {
+            var value = arr[i];
+            setTimeout(function() {
+                console.log("value", value);
+            }, 0);
+        };
+        arr = [
+            "value1",
+            "value2",
+            "value3"
+        ];
+        // for (const value of arr) {
+        for(i = 0; i < arr.length; i++)_loop(i);
+        return [
+            2
+        ];
+    });
+})();

crates/swc/tests/fixture/issues-7xxx/7432/input/exec.js

@@ -0,0 +1,7 @@
+(async () => {
+    const array = [1, 2, 3]
+    for (const el of array)
+        setTimeout(() => {
+            console.log(el)
+        }, 1)
+})()

crates/swc/tests/fixture/issues-7xxx/7432/output/exec.js

@@ -0,0 +1,38 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+_async_to_generator(function() {
+    var array, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
+    return _ts_generator(this, function(_state) {
+        array = [
+            1,
+            2,
+            3
+        ];
+        _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            _loop = function() {
+                var el = _step.value;
+                setTimeout(function() {
+                    console.log(el);
+                }, 1);
+            };
+            for(_iterator = array[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+        return [
+            2
+        ];
+    });
+})();

crates/swc_ecma_preset_env/src/lib.rs

@@ -279,8 +279,8 @@ where
         es2015::destructuring(es2015::destructuring::Config { loose }),
         true
     );
-    let pass = add!(pass, Regenerator, generator(global_mark, comments), true);
     let pass = add!(pass, BlockScoping, es2015::block_scoping(global_mark), true);
+    let pass = add!(pass, Regenerator, generator(global_mark, comments), true);
 
     let pass = add!(pass, NewTarget, es2015::new_target(), true);
 

crates/swc_ecma_transforms_compat/tests/block-scoping/issue-6898/1/exec.js

@@ -0,0 +1,15 @@
+(async () => {
+    const arr = [
+        'value1',
+        'value2',
+        'value3',
+    ];
+
+    // for (const value of arr) {
+    for (let i = 0; i < arr.length; i++) {
+        const value = arr[i];
+        setTimeout(() => {
+            console.log('value', value);
+        }, 0);
+    }
+})();

crates/swc_ecma_transforms_compat/tests/block-scoping/issue-7432/1/exec.js

@@ -0,0 +1,7 @@
+(async () => {
+    const array = [1, 2, 3]
+    for (const el of array)
+        setTimeout(() => {
+            console.log(el)
+        }, 1)
+})()

crates/swc_ecma_transforms_compat/tests/es2015_block_scoping.rs

@@ -1025,6 +1025,22 @@ fn exec(input: PathBuf) {
         },
         &input,
     );
+
+    compare_stdout(
+        Default::default(),
+        |t| {
+            let unresolved_mark = Mark::new();
+            chain!(
+                resolver(unresolved_mark, Mark::new(), false),
+                es2015(
+                    unresolved_mark,
+                    Some(t.comments.clone()),
+                    Default::default()
+                )
+            )
+        },
+        &input,
+    );
 }
 
 #[testing::fixture("tests/block-scoping/**/input.js")]