Skip to content

Commit 21bbb57

Browse files
rbucktonrbuckton
authored
Fix captured const in downlevel for-await (#47680)
1 parent 63d9d4c commit 21bbb57

File tree

3 files changed

+195
-0
lines changed

3 files changed

+195
-0
lines changed

‎src/compiler/transformers/es2018.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ namespace ts {
722722
),
723723
EmitFlags.NoTokenTrailingSourceMaps
724724
);
725+
setOriginalNode(forStatement, node);
725726

726727
return factory.createTryStatement(
727728
factory.createBlock([

‎tests/baselines/reference/forAwaitPerIterationBindingDownlevel.js

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
//// [forAwaitPerIterationBindingDownlevel.ts]
2+
const sleep = (tm: number) => new Promise(resolve => setTimeout(resolve, tm));
3+
4+
async function* gen() {
5+
yield 1;
6+
await sleep(1000);
7+
yield 2;
8+
}
9+
10+
const log = console.log;
11+
12+
(async () => {
13+
for await (const outer of gen()) {
14+
log(`I'm loop ${outer}`);
15+
(async () => {
16+
const inner = outer;
17+
await sleep(2000);
18+
if (inner === outer) {
19+
log(`I'm loop ${inner} and I know I'm loop ${outer}`);
20+
} else {
21+
log(`I'm loop ${inner}, but I think I'm loop ${outer}`);
22+
}
23+
})();
24+
}
25+
})();
26+
27+
//// [forAwaitPerIterationBindingDownlevel.js]
28+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
29+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
30+
return new (P || (P = Promise))(function (resolve, reject) {
31+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
32+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
33+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
34+
step((generator = generator.apply(thisArg, _arguments || [])).next());
35+
});
36+
};
37+
var __generator = (this && this.__generator) || function (thisArg, body) {
38+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
39+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
40+
function verb(n) { return function (v) { return step([n, v]); }; }
41+
function step(op) {
42+
if (f) throw new TypeError("Generator is already executing.");
43+
while (_) try {
44+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
45+
if (y = 0, t) op = [op[0] & 2, t.value];
46+
switch (op[0]) {
47+
case 0: case 1: t = op; break;
48+
case 4: _.label++; return { value: op[1], done: false };
49+
case 5: _.label++; y = op[1]; op = [0]; continue;
50+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
51+
default:
52+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
53+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
54+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
55+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
56+
if (t[2]) _.ops.pop();
57+
_.trys.pop(); continue;
58+
}
59+
op = body.call(thisArg, _);
60+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
61+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
62+
}
63+
};
64+
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
65+
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
66+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
67+
var g = generator.apply(thisArg, _arguments || []), i, q = [];
68+
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
69+
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
70+
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
71+
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
72+
function fulfill(value) { resume("next", value); }
73+
function reject(value) { resume("throw", value); }
74+
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
75+
};
76+
var __asyncValues = (this && this.__asyncValues) || function (o) {
77+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
78+
var m = o[Symbol.asyncIterator], i;
79+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
80+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
81+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
82+
};
83+
var _this = this;
84+
var sleep = function (tm) { return new Promise(function (resolve) { return setTimeout(resolve, tm); }); };
85+
function gen() {
86+
return __asyncGenerator(this, arguments, function gen_1() {
87+
return __generator(this, function (_a) {
88+
switch (_a.label) {
89+
case 0: return [4 /*yield*/, __await(1)];
90+
case 1: return [4 /*yield*/, _a.sent()];
91+
case 2:
92+
_a.sent();
93+
return [4 /*yield*/, __await(sleep(1000))];
94+
case 3:
95+
_a.sent();
96+
return [4 /*yield*/, __await(2)];
97+
case 4: return [4 /*yield*/, _a.sent()];
98+
case 5:
99+
_a.sent();
100+
return [2 /*return*/];
101+
}
102+
});
103+
});
104+
}
105+
var log = console.log;
106+
(function () { return __awaiter(_this, void 0, void 0, function () {
107+
var _loop_1, _a, _b, e_1_1;
108+
var _this = this;
109+
var e_1, _c;
110+
return __generator(this, function (_d) {
111+
switch (_d.label) {
112+
case 0:
113+
_d.trys.push([0, 5, 6, 11]);
114+
_loop_1 = function () {
115+
var outer = _b.value;
116+
log("I'm loop ".concat(outer));
117+
(function () { return __awaiter(_this, void 0, void 0, function () {
118+
var inner;
119+
return __generator(this, function (_a) {
120+
switch (_a.label) {
121+
case 0:
122+
inner = outer;
123+
return [4 /*yield*/, sleep(2000)];
124+
case 1:
125+
_a.sent();
126+
if (inner === outer) {
127+
log("I'm loop ".concat(inner, " and I know I'm loop ").concat(outer));
128+
}
129+
else {
130+
log("I'm loop ".concat(inner, ", but I think I'm loop ").concat(outer));
131+
}
132+
return [2 /*return*/];
133+
}
134+
});
135+
}); })();
136+
};
137+
_a = __asyncValues(gen());
138+
_d.label = 1;
139+
case 1: return [4 /*yield*/, _a.next()];
140+
case 2:
141+
if (!(_b = _d.sent(), !_b.done)) return [3 /*break*/, 4];
142+
_loop_1();
143+
_d.label = 3;
144+
case 3: return [3 /*break*/, 1];
145+
case 4: return [3 /*break*/, 11];
146+
case 5:
147+
e_1_1 = _d.sent();
148+
e_1 = { error: e_1_1 };
149+
return [3 /*break*/, 11];
150+
case 6:
151+
_d.trys.push([6, , 9, 10]);
152+
if (!(_b && !_b.done && (_c = _a.return))) return [3 /*break*/, 8];
153+
return [4 /*yield*/, _c.call(_a)];
154+
case 7:
155+
_d.sent();
156+
_d.label = 8;
157+
case 8: return [3 /*break*/, 10];
158+
case 9:
159+
if (e_1) throw e_1.error;
160+
return [7 /*endfinally*/];
161+
case 10: return [7 /*endfinally*/];
162+
case 11: return [2 /*return*/];
163+
}
164+
});
165+
}); })();

‎tests/cases/conformance/statements/for-await-ofStatements/forAwaitPerIterationBindingDownlevel.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// @target: es5
2+
// @lib: esnext, dom
3+
// @downlevelIteration: true
4+
// @noTypesAndSymbols: true
5+
6+
const sleep = (tm: number) => new Promise(resolve => setTimeout(resolve, tm));
7+
8+
async function* gen() {
9+
yield 1;
10+
await sleep(1000);
11+
yield 2;
12+
}
13+
14+
const log = console.log;
15+
16+
(async () => {
17+
for await (const outer of gen()) {
18+
log(`I'm loop ${outer}`);
19+
(async () => {
20+
const inner = outer;
21+
await sleep(2000);
22+
if (inner === outer) {
23+
log(`I'm loop ${inner} and I know I'm loop ${outer}`);
24+
} else {
25+
log(`I'm loop ${inner}, but I think I'm loop ${outer}`);
26+
}
27+
})();
28+
}
29+
})();

0 commit comments

Comments
 (0)