diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts index 7bbc387cc146a..ab2fead2e6e84 100644 --- a/src/compiler/factory/emitHelpers.ts +++ b/src/compiler/factory/emitHelpers.ts @@ -287,7 +287,7 @@ namespace ts { return factory.createCallExpression( getUnscopedHelperName("__spreadArray"), /*typeArguments*/ undefined, - packFrom ? [to, from, factory.createTrue()] : [to, from] + [to, from, packFrom ? factory.createTrue() : factory.createFalse()] ); } @@ -638,7 +638,7 @@ namespace ts { scoped: false, text: ` var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/argumentExpressionContextualTyping.js b/tests/baselines/reference/argumentExpressionContextualTyping.js index 9c57d33bf5aa2..99b9b3fa507e2 100644 --- a/tests/baselines/reference/argumentExpressionContextualTyping.js +++ b/tests/baselines/reference/argumentExpressionContextualTyping.js @@ -20,7 +20,7 @@ foo(o); // Error because x has an array type namely //// [argumentExpressionContextualTyping.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/arrayLiteralExpressionContextualTyping.js b/tests/baselines/reference/arrayLiteralExpressionContextualTyping.js index cd450cec29b3b..0024c04474a23 100644 --- a/tests/baselines/reference/arrayLiteralExpressionContextualTyping.js +++ b/tests/baselines/reference/arrayLiteralExpressionContextualTyping.js @@ -17,7 +17,7 @@ var spr2:[number, number, number] = [1, 2, 3, ...tup]; // Error //// [arrayLiteralExpressionContextualTyping.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/arrayLiteralSpread.js b/tests/baselines/reference/arrayLiteralSpread.js index 08b9227409bd2..21ede49524708 100644 --- a/tests/baselines/reference/arrayLiteralSpread.js +++ b/tests/baselines/reference/arrayLiteralSpread.js @@ -25,7 +25,7 @@ function f2() { //// [arrayLiteralSpread.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -38,15 +38,15 @@ function f0() { var a1 = __spreadArray([], a, true); var a2 = __spreadArray([1], a, true); var a3 = __spreadArray([1, 2], a, true); - var a4 = __spreadArray(__spreadArray([], a, true), [1]); - var a5 = __spreadArray(__spreadArray([], a, true), [1, 2]); - var a6 = __spreadArray(__spreadArray([1, 2], a, true), [1, 2]); - var a7 = __spreadArray(__spreadArray(__spreadArray([1], a, true), [2]), a, true); + var a4 = __spreadArray(__spreadArray([], a, true), [1], false); + var a5 = __spreadArray(__spreadArray([], a, true), [1, 2], false); + var a6 = __spreadArray(__spreadArray([1, 2], a, true), [1, 2], false); + var a7 = __spreadArray(__spreadArray(__spreadArray([1], a, true), [2], false), a, true); var a8 = __spreadArray(__spreadArray(__spreadArray([], a, true), a, true), a, true); } function f1() { var a = [1, 2, 3]; - var b = __spreadArray(__spreadArray(["hello"], a, true), [true]); + var b = __spreadArray(__spreadArray(["hello"], a, true), [true], false); var b; } function f2() { diff --git a/tests/baselines/reference/arrayLiteralSpreadES5iterable.js b/tests/baselines/reference/arrayLiteralSpreadES5iterable.js index 2993fec841e95..f48d63af1c138 100644 --- a/tests/baselines/reference/arrayLiteralSpreadES5iterable.js +++ b/tests/baselines/reference/arrayLiteralSpreadES5iterable.js @@ -41,7 +41,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -51,18 +51,18 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { }; function f0() { var a = [1, 2, 3]; - var a1 = __spreadArray([], __read(a)); - var a2 = __spreadArray([1], __read(a)); - var a3 = __spreadArray([1, 2], __read(a)); - var a4 = __spreadArray(__spreadArray([], __read(a)), [1]); - var a5 = __spreadArray(__spreadArray([], __read(a)), [1, 2]); - var a6 = __spreadArray(__spreadArray([1, 2], __read(a)), [1, 2]); - var a7 = __spreadArray(__spreadArray(__spreadArray([1], __read(a)), [2]), __read(a)); - var a8 = __spreadArray(__spreadArray(__spreadArray([], __read(a)), __read(a)), __read(a)); + var a1 = __spreadArray([], __read(a), false); + var a2 = __spreadArray([1], __read(a), false); + var a3 = __spreadArray([1, 2], __read(a), false); + var a4 = __spreadArray(__spreadArray([], __read(a), false), [1], false); + var a5 = __spreadArray(__spreadArray([], __read(a), false), [1, 2], false); + var a6 = __spreadArray(__spreadArray([1, 2], __read(a), false), [1, 2], false); + var a7 = __spreadArray(__spreadArray(__spreadArray([1], __read(a), false), [2], false), __read(a), false); + var a8 = __spreadArray(__spreadArray(__spreadArray([], __read(a), false), __read(a), false), __read(a), false); } function f1() { var a = [1, 2, 3]; - var b = __spreadArray(__spreadArray(["hello"], __read(a)), [true]); + var b = __spreadArray(__spreadArray(["hello"], __read(a), false), [true], false); var b; } function f2() { diff --git a/tests/baselines/reference/arrayLiterals2ES5.js b/tests/baselines/reference/arrayLiterals2ES5.js index 87668d86571a1..92c854b61fdd7 100644 --- a/tests/baselines/reference/arrayLiterals2ES5.js +++ b/tests/baselines/reference/arrayLiterals2ES5.js @@ -63,7 +63,7 @@ var d9 = [[...temp1], ...["hello"]]; // ElementList, Elisionopt AssignmentExpression // ElementList, Elisionopt SpreadElement var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -75,10 +75,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { // ... AssignmentExpression var a0 = [, , 2, 3, 4]; var a1 = ["hello", "world"]; -var a2 = __spreadArray(__spreadArray([, , ,], a0, true), ["hello"]); +var a2 = __spreadArray(__spreadArray([, , ,], a0, true), ["hello"], false); var a3 = __spreadArray([, ,], a0, true); var a4 = [function () { return 1; },]; -var a5 = __spreadArray(__spreadArray([], a0, true), [,]); +var a5 = __spreadArray(__spreadArray([], a0, true), [,], false); // Each element expression in a non-empty array literal is processed as follows: // - If the array literal contains no spread elements, and if the array literal is contextually typed (section 4.19) // by a type T and T has a property with the numeric name N, where N is the index of the element expression in the array literal, @@ -110,4 +110,4 @@ var d5 = __spreadArray([], temp3, true); var d6 = __spreadArray([], temp4, true); var d7 = __spreadArray([], temp1, true); var d8 = [__spreadArray([], temp1, true)]; -var d9 = __spreadArray([__spreadArray([], temp1, true)], ["hello"]); +var d9 = __spreadArray([__spreadArray([], temp1, true)], ["hello"], false); diff --git a/tests/baselines/reference/arrayLiterals3.js b/tests/baselines/reference/arrayLiterals3.js index b40788eea706a..17379266960c2 100644 --- a/tests/baselines/reference/arrayLiterals3.js +++ b/tests/baselines/reference/arrayLiterals3.js @@ -41,7 +41,7 @@ var c2: myArray = [...temp1, ...temp]; // Error cannot assign (number // by a type T and T has a property with the numeric name N, where N is the index of the element expression in the array literal, // the element expression is contextually typed by the type of that property. var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/callChain.js b/tests/baselines/reference/callChain.js index 49b26fdcc0d70..6295f59d2b2b0 100644 --- a/tests/baselines/reference/callChain.js +++ b/tests/baselines/reference/callChain.js @@ -44,7 +44,7 @@ o2?.b()!.toString!; //// [callChain.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -56,27 +56,27 @@ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o; o1 === null || o1 === void 0 ? void 0 : o1(); o1 === null || o1 === void 0 ? void 0 : o1(1); o1 === null || o1 === void 0 ? void 0 : o1.apply(void 0, [1, 2]); -o1 === null || o1 === void 0 ? void 0 : o1.apply(void 0, __spreadArray(__spreadArray([1], [2, 3]), [4])); +o1 === null || o1 === void 0 ? void 0 : o1.apply(void 0, __spreadArray(__spreadArray([1], [2, 3], false), [4], false)); o2 === null || o2 === void 0 ? void 0 : o2.b(); o2 === null || o2 === void 0 ? void 0 : o2.b(1); o2 === null || o2 === void 0 ? void 0 : o2.b.apply(o2, [1, 2]); -o2 === null || o2 === void 0 ? void 0 : o2.b.apply(o2, __spreadArray(__spreadArray([1], [2, 3]), [4])); +o2 === null || o2 === void 0 ? void 0 : o2.b.apply(o2, __spreadArray(__spreadArray([1], [2, 3], false), [4], false)); o2 === null || o2 === void 0 ? void 0 : o2["b"](); o2 === null || o2 === void 0 ? void 0 : o2["b"](1); o2 === null || o2 === void 0 ? void 0 : o2["b"].apply(o2, [1, 2]); -o2 === null || o2 === void 0 ? void 0 : o2["b"].apply(o2, __spreadArray(__spreadArray([1], [2, 3]), [4])); +o2 === null || o2 === void 0 ? void 0 : o2["b"].apply(o2, __spreadArray(__spreadArray([1], [2, 3], false), [4], false)); (_a = o3.b) === null || _a === void 0 ? void 0 : _a.call(o3).c; (_b = o3.b) === null || _b === void 0 ? void 0 : _b.call(o3, 1).c; -(_c = o3.b) === null || _c === void 0 ? void 0 : _c.call.apply(_c, __spreadArray([o3], [1, 2])).c; -(_d = o3.b) === null || _d === void 0 ? void 0 : _d.call.apply(_d, __spreadArray(__spreadArray([o3, 1], [2, 3]), [4])).c; +(_c = o3.b) === null || _c === void 0 ? void 0 : _c.call.apply(_c, __spreadArray([o3], [1, 2], false)).c; +(_d = o3.b) === null || _d === void 0 ? void 0 : _d.call.apply(_d, __spreadArray(__spreadArray([o3, 1], [2, 3], false), [4], false)).c; (_e = o3.b) === null || _e === void 0 ? void 0 : _e.call(o3)["c"]; (_f = o3.b) === null || _f === void 0 ? void 0 : _f.call(o3, 1)["c"]; -(_g = o3.b) === null || _g === void 0 ? void 0 : _g.call.apply(_g, __spreadArray([o3], [1, 2]))["c"]; -(_h = o3.b) === null || _h === void 0 ? void 0 : _h.call.apply(_h, __spreadArray(__spreadArray([o3, 1], [2, 3]), [4]))["c"]; +(_g = o3.b) === null || _g === void 0 ? void 0 : _g.call.apply(_g, __spreadArray([o3], [1, 2], false))["c"]; +(_h = o3.b) === null || _h === void 0 ? void 0 : _h.call.apply(_h, __spreadArray(__spreadArray([o3, 1], [2, 3], false), [4], false))["c"]; (_j = o3["b"]) === null || _j === void 0 ? void 0 : _j.call(o3).c; (_k = o3["b"]) === null || _k === void 0 ? void 0 : _k.call(o3, 1).c; -(_l = o3["b"]) === null || _l === void 0 ? void 0 : _l.call.apply(_l, __spreadArray([o3], [1, 2])).c; -(_m = o3["b"]) === null || _m === void 0 ? void 0 : _m.call.apply(_m, __spreadArray(__spreadArray([o3, 1], [2, 3]), [4])).c; +(_l = o3["b"]) === null || _l === void 0 ? void 0 : _l.call.apply(_l, __spreadArray([o3], [1, 2], false)).c; +(_m = o3["b"]) === null || _m === void 0 ? void 0 : _m.call.apply(_m, __spreadArray(__spreadArray([o3, 1], [2, 3], false), [4], false)).c; var v = o4 === null || o4 === void 0 ? void 0 : o4(incr); (_o = o5()) === null || _o === void 0 ? void 0 : _o(); // GH#36031 diff --git a/tests/baselines/reference/callOverload.js b/tests/baselines/reference/callOverload.js index 2e26489209209..56fee3bfea6bc 100644 --- a/tests/baselines/reference/callOverload.js +++ b/tests/baselines/reference/callOverload.js @@ -13,7 +13,7 @@ withRest(...n); //// [callOverload.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -25,6 +25,6 @@ var n; fn(1); // no error fn(1, 2, 3, 4); takeTwo(1, 2, 3, 4); -withRest.apply(void 0, __spreadArray(['a'], n)); // no error +withRest.apply(void 0, __spreadArray(['a'], n, false)); // no error withRest(); withRest.apply(void 0, n); diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js index 2e06d70db227c..042526ca77514 100644 --- a/tests/baselines/reference/callWithSpread.js +++ b/tests/baselines/reference/callWithSpread.js @@ -75,7 +75,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -95,23 +95,23 @@ var z; var obj; var xa; foo(1, 2, "abc"); -foo.apply(void 0, __spreadArray([1, 2], a)); -foo.apply(void 0, __spreadArray(__spreadArray([1, 2], a), ["abc"])); +foo.apply(void 0, __spreadArray([1, 2], a, false)); +foo.apply(void 0, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); obj.foo(1, 2, "abc"); -obj.foo.apply(obj, __spreadArray([1, 2], a)); -obj.foo.apply(obj, __spreadArray(__spreadArray([1, 2], a), ["abc"])); -obj.foo.apply(obj, __spreadArray([1, 2], a)).foo(1, 2, "abc"); -(_a = obj.foo.apply(obj, __spreadArray([1, 2], a))).foo.apply(_a, __spreadArray([1, 2], a)); -(_b = obj.foo.apply(obj, __spreadArray([1, 2], a))).foo.apply(_b, __spreadArray(__spreadArray([1, 2], a), ["abc"])); +obj.foo.apply(obj, __spreadArray([1, 2], a, false)); +obj.foo.apply(obj, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); +obj.foo.apply(obj, __spreadArray([1, 2], a, false)).foo(1, 2, "abc"); +(_a = obj.foo.apply(obj, __spreadArray([1, 2], a, false))).foo.apply(_a, __spreadArray([1, 2], a, false)); +(_b = obj.foo.apply(obj, __spreadArray([1, 2], a, false))).foo.apply(_b, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); (obj.foo)(1, 2, "abc"); -obj.foo.apply(obj, __spreadArray([1, 2], a)); -obj.foo.apply(obj, __spreadArray(__spreadArray([1, 2], a), ["abc"])); -(obj.foo.apply(obj, __spreadArray([1, 2], a)).foo)(1, 2, "abc"); -(_c = obj.foo.apply(obj, __spreadArray([1, 2], a))).foo.apply(_c, __spreadArray([1, 2], a)); -(_d = obj.foo.apply(obj, __spreadArray([1, 2], a))).foo.apply(_d, __spreadArray(__spreadArray([1, 2], a), ["abc"])); +obj.foo.apply(obj, __spreadArray([1, 2], a, false)); +obj.foo.apply(obj, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); +(obj.foo.apply(obj, __spreadArray([1, 2], a, false)).foo)(1, 2, "abc"); +(_c = obj.foo.apply(obj, __spreadArray([1, 2], a, false))).foo.apply(_c, __spreadArray([1, 2], a, false)); +(_d = obj.foo.apply(obj, __spreadArray([1, 2], a, false))).foo.apply(_d, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); xa[1].foo(1, 2, "abc"); -(_e = xa[1]).foo.apply(_e, __spreadArray([1, 2], a)); -(_f = xa[1]).foo.apply(_f, __spreadArray(__spreadArray([1, 2], a), ["abc"])); +(_e = xa[1]).foo.apply(_e, __spreadArray([1, 2], a, false)); +(_f = xa[1]).foo.apply(_f, __spreadArray(__spreadArray([1, 2], a, false), ["abc"], false)); (_g = xa[1]).foo.apply(_g, [1, 2, "abc"]); var C = /** @class */ (function () { function C(x, y) { @@ -120,7 +120,7 @@ var C = /** @class */ (function () { z[_i - 2] = arguments[_i]; } this.foo(x, y); - this.foo.apply(this, __spreadArray([x, y], z)); + this.foo.apply(this, __spreadArray([x, y], z, false)); } C.prototype.foo = function (x, y) { var z = []; @@ -134,12 +134,12 @@ var D = /** @class */ (function (_super) { __extends(D, _super); function D() { var _this = _super.call(this, 1, 2) || this; - _this = _super.apply(this, __spreadArray([1, 2], a)) || this; + _this = _super.apply(this, __spreadArray([1, 2], a, false)) || this; return _this; } D.prototype.foo = function () { _super.prototype.foo.call(this, 1, 2); - _super.prototype.foo.apply(this, __spreadArray([1, 2], a)); + _super.prototype.foo.apply(this, __spreadArray([1, 2], a, false)); }; return D; }(C)); diff --git a/tests/baselines/reference/callWithSpread2.js b/tests/baselines/reference/callWithSpread2.js index 3154179d1f298..d289b1e82243f 100644 --- a/tests/baselines/reference/callWithSpread2.js +++ b/tests/baselines/reference/callWithSpread2.js @@ -39,7 +39,7 @@ prefix2("g", ...ns); //// [callWithSpread2.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -52,19 +52,19 @@ all.apply(void 0, ns); weird.apply(void 0, ns); weird.apply(void 0, mixed); weird.apply(void 0, tuple); -prefix.apply(void 0, __spreadArray(["a"], ns)); -rest.apply(void 0, __spreadArray(["d"], ns)); +prefix.apply(void 0, __spreadArray(["a"], ns, false)); +rest.apply(void 0, __spreadArray(["d"], ns, false)); // extra arguments -normal.apply(void 0, __spreadArray(["g"], ns)); +normal.apply(void 0, __spreadArray(["g"], ns, false)); thunk.apply(void 0, ns); // bad all.apply(void 0, mixed); all.apply(void 0, tuple); -prefix.apply(void 0, __spreadArray(["b"], mixed)); -prefix.apply(void 0, __spreadArray(["c"], tuple)); -rest.apply(void 0, __spreadArray(["e"], mixed)); -rest.apply(void 0, __spreadArray(["f"], tuple)); +prefix.apply(void 0, __spreadArray(["b"], mixed, false)); +prefix.apply(void 0, __spreadArray(["c"], tuple, false)); +rest.apply(void 0, __spreadArray(["e"], mixed, false)); +rest.apply(void 0, __spreadArray(["f"], tuple, false)); prefix.apply(void 0, ns); // required parameters are required prefix.apply(void 0, mixed); prefix.apply(void 0, tuple); -prefix2.apply(void 0, __spreadArray(["g"], ns)); +prefix2.apply(void 0, __spreadArray(["g"], ns, false)); diff --git a/tests/baselines/reference/callWithSpread3.js b/tests/baselines/reference/callWithSpread3.js index fca1ebcc9891c..d41683ec0d468 100644 --- a/tests/baselines/reference/callWithSpread3.js +++ b/tests/baselines/reference/callWithSpread3.js @@ -38,7 +38,7 @@ fs5(...s2, "foo", ...s2); //// [callWithSpread3.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -47,24 +47,24 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; // error -fs2.apply(void 0, __spreadArray(['a'], s2)); // error on ...s2 -fs2.apply(void 0, __spreadArray(['a', 'b', 'c'], s2)); // error on 'c' and ...s2 -fs2.apply(void 0, __spreadArray(__spreadArray(['a', 'b'], s2), ['c'])); // error on ...s2 and 'c' -fs2.apply(void 0, __spreadArray(__spreadArray(['a', 'b', 'c'], s2), ['d'])); // error on 'c', ...s2 and 'd' -fs2.apply(void 0, __spreadArray(__spreadArray([], s2), ['a'])); // error on 'a' +fs2.apply(void 0, __spreadArray(['a'], s2, false)); // error on ...s2 +fs2.apply(void 0, __spreadArray(['a', 'b', 'c'], s2, false)); // error on 'c' and ...s2 +fs2.apply(void 0, __spreadArray(__spreadArray(['a', 'b'], s2, false), ['c'], false)); // error on ...s2 and 'c' +fs2.apply(void 0, __spreadArray(__spreadArray(['a', 'b', 'c'], s2, false), ['d'], false)); // error on 'c', ...s2 and 'd' +fs2.apply(void 0, __spreadArray(__spreadArray([], s2, false), ['a'], false)); // error on 'a' fs2.apply(void 0, s3); // error on ...s3 fs2_.apply(void 0, s_); // error on ...s_ fs2_.apply(void 0, s2n_); // error on ...s2n_ -fs2_.apply(void 0, __spreadArray(__spreadArray([], s_), s_)); // error on ...s_ -fs2_.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], s_), s_), s_)); // error on ...s_ +fs2_.apply(void 0, __spreadArray(__spreadArray([], s_, false), s_, false)); // error on ...s_ +fs2_.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], s_, false), s_, false), s_, false)); // error on ...s_ // fs2n_(...s2, ...s_); // FIXME: should be a type error fs2n_.apply(void 0, s2_); // error on ...s2_ // ok fs2_.apply(void 0, s2_); -fs2_.apply(void 0, __spreadArray(__spreadArray([], s2_), s_)); -fs2_.apply(void 0, __spreadArray(__spreadArray([], s2_), s2_)); -fs2_.apply(void 0, __spreadArray(__spreadArray([], s_), s2_)); +fs2_.apply(void 0, __spreadArray(__spreadArray([], s2_, false), s_, false)); +fs2_.apply(void 0, __spreadArray(__spreadArray([], s2_, false), s2_, false)); +fs2_.apply(void 0, __spreadArray(__spreadArray([], s_, false), s2_, false)); fs2n_.apply(void 0, s2n_); fs2n_.apply(void 0, s2); // fs2n_(...s2, ...n_); // FIXME: should compile -fs5.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], s2), ["foo"]), s2)); +fs5.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], s2, false), ["foo"], false), s2, false)); diff --git a/tests/baselines/reference/callWithSpread5.js b/tests/baselines/reference/callWithSpread5.js index fa596792fa03f..3ecf38786ddea 100644 --- a/tests/baselines/reference/callWithSpread5.js +++ b/tests/baselines/reference/callWithSpread5.js @@ -10,7 +10,7 @@ fn(...nntnnnt, x) //// [callWithSpread5.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -18,5 +18,5 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { } return to.concat(ar || from); }; -fn.apply(void 0, __spreadArray(__spreadArray([], nnnu), [x])); -fn.apply(void 0, __spreadArray(__spreadArray([], nntnnnt), [x])); +fn.apply(void 0, __spreadArray(__spreadArray([], nnnu, false), [x], false)); +fn.apply(void 0, __spreadArray(__spreadArray([], nntnnnt, false), [x], false)); diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.js b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.js index f6c8631c3543f..7e6f12a09911c 100644 --- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.js +++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5.js @@ -71,7 +71,7 @@ var [c14, c15, c16] = [1, 2, "string"]; * ... LeftHandSideExpression */ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.js b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.js index 5c908427963f2..8f307a0c0a390 100644 --- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.js +++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment1ES5iterable.js @@ -87,7 +87,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -113,7 +113,7 @@ var _g = __read(foo(), 2), b6 = _g[0], b7 = _g[1]; var _h = __read(foo()), b8 = _h.slice(0); // S is not a tuple- like type and the numeric index signature type of S is assignable to the target given in E. var temp = [1, 2, 3]; -var _j = __read(__spreadArray([], __read(temp)), 2), c0 = _j[0], c1 = _j[1]; +var _j = __read(__spreadArray([], __read(temp), false), 2), c0 = _j[0], c1 = _j[1]; var _k = __read([], 1), c2 = _k[0]; var _l = __read([[[]], [[[[]]]]], 2), _m = __read(_l[0], 1), _o = __read(_m[0], 1), c3 = _o[0], _p = __read(_l[1], 1), _q = __read(_p[0], 1), _r = __read(_q[0], 1), _s = __read(_r[0], 1), c4 = _s[0]; var _t = __read([[1], true], 2), _u = __read(_t[0], 1), c5 = _u[0], c6 = _t[1]; diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.js b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.js index 71db6e78eca30..6479945c41cf3 100644 --- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.js +++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.js @@ -36,7 +36,7 @@ var [c4, c5, c6] = foo(1); // Error //// [destructuringArrayBindingPatternAndAssignment2.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js index d44128f9d4c02..75f59f73d0fcf 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js +++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js @@ -65,7 +65,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -114,8 +114,8 @@ function a11(_a) { } var array = [1, 2, 3]; var array2 = [true, false, "hello"]; -a2(__spreadArray([], __read(array))); -a1.apply(void 0, __spreadArray([], __read(array))); +a2(__spreadArray([], __read(array), false)); +a1.apply(void 0, __spreadArray([], __read(array), false)); a9([1, 2, [["string"]], false, true]); // Parameter type is [any, any, [[any]]] a10([1, 2, [["string"]], false, true]); // Parameter type is any[] a10([1, 2, 3, false, true]); // Parameter type is any[] diff --git a/tests/baselines/reference/destructuringVariableDeclaration1ES5.js b/tests/baselines/reference/destructuringVariableDeclaration1ES5.js index b6871c875a638..248a288fdfd76 100644 --- a/tests/baselines/reference/destructuringVariableDeclaration1ES5.js +++ b/tests/baselines/reference/destructuringVariableDeclaration1ES5.js @@ -43,7 +43,7 @@ var {h: {h1 = [undefined, null]}}: { h: { h1: number[] } } = { h: { h1: [1, 2] } //// [destructuringVariableDeclaration1ES5.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/destructuringVariableDeclaration1ES5iterable.js b/tests/baselines/reference/destructuringVariableDeclaration1ES5iterable.js index 528b17e3e2528..1634cb390593d 100644 --- a/tests/baselines/reference/destructuringVariableDeclaration1ES5iterable.js +++ b/tests/baselines/reference/destructuringVariableDeclaration1ES5iterable.js @@ -59,7 +59,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -91,7 +91,7 @@ var _s = __read([1, "string"], 2), d1 = _s[0], d2 = _s[1]; // Otherwise, if S is a tuple- like type (section 3.3.3): // Otherwise, if S has a numeric index signature, T is the type of the numeric index signature. var temp1 = [true, false, true]; -var _t = __read(__spreadArray([1, "string"], __read(temp1)), 2), d3 = _t[0], d4 = _t[1]; +var _t = __read(__spreadArray([1, "string"], __read(temp1), false), 2), d3 = _t[0], d4 = _t[1]; // Combining both forms of destructuring, var _u = __read({ e: [1, 2, { b1: 4, b4: 0 }] }.e, 3), e1 = _u[0], e2 = _u[1], _v = _u[2], e3 = _v === void 0 ? { b1: 1000, b4: 200 } : _v; var _w = __read({ f: [1, 2, { f3: 4, f5: 0 }] }.f, 4), f1 = _w[0], f2 = _w[1], _x = _w[2], f4 = _x.f3, f5 = _x.f5; diff --git a/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js index 92b43765f9fbe..743043f9077d9 100644 --- a/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js +++ b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js @@ -70,7 +70,7 @@ function arrayLiteral2() { _a = [[]]; return [4 /*yield*/, y]; case 1: - x = __spreadArray.apply(void 0, [__spreadArray.apply(void 0, _a.concat([(_b.sent()), true])), [z]]); + x = __spreadArray.apply(void 0, [__spreadArray.apply(void 0, _a.concat([(_b.sent()), true])), [z], false]); return [2 /*return*/]; } }); @@ -85,7 +85,7 @@ function arrayLiteral3() { _a = [__spreadArray([], y, true)]; return [4 /*yield*/, z]; case 1: - x = __spreadArray.apply(void 0, _a.concat([[_b.sent()]])); + x = __spreadArray.apply(void 0, _a.concat([[_b.sent()], false])); return [2 /*return*/]; } }); diff --git a/tests/baselines/reference/es5-asyncFunctionCallExpressions.js b/tests/baselines/reference/es5-asyncFunctionCallExpressions.js index ccb120716446d..fc0b8fa15d716 100644 --- a/tests/baselines/reference/es5-asyncFunctionCallExpressions.js +++ b/tests/baselines/reference/es5-asyncFunctionCallExpressions.js @@ -146,7 +146,7 @@ function callExpression4() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { switch (_a.label) { - case 0: return [4 /*yield*/, x.apply(void 0, __spreadArray(__spreadArray([], y), [z]))]; + case 0: return [4 /*yield*/, x.apply(void 0, __spreadArray(__spreadArray([], y, false), [z], false))]; case 1: _a.sent(); return [2 /*return*/]; @@ -160,7 +160,7 @@ function callExpression5() { switch (_a.label) { case 0: return [4 /*yield*/, x]; case 1: - (_a.sent()).apply(void 0, __spreadArray(__spreadArray([], y), [z])); + (_a.sent()).apply(void 0, __spreadArray(__spreadArray([], y, false), [z], false)); return [2 /*return*/]; } }); @@ -177,7 +177,7 @@ function callExpression6() { _d = [[]]; return [4 /*yield*/, y]; case 1: - _b.apply(_a, _c.concat([__spreadArray.apply(void 0, [__spreadArray.apply(void 0, _d.concat([(_e.sent())])), [z]])])); + _b.apply(_a, _c.concat([__spreadArray.apply(void 0, [__spreadArray.apply(void 0, _d.concat([(_e.sent()), false])), [z], false])])); return [2 /*return*/]; } }); @@ -191,10 +191,10 @@ function callExpression7() { case 0: _b = (_a = x).apply; _c = [void 0]; - _d = [__spreadArray([], y)]; + _d = [__spreadArray([], y, false)]; return [4 /*yield*/, z]; case 1: - _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([[_e.sent()]]))])); + _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([[_e.sent()], false]))])); return [2 /*return*/]; } }); @@ -210,7 +210,7 @@ function callExpression8() { _c = [void 0]; return [4 /*yield*/, y]; case 1: - _b.apply(_a, _c.concat([__spreadArray.apply(void 0, [[_d.sent()], z])])); + _b.apply(_a, _c.concat([__spreadArray.apply(void 0, [[_d.sent()], z, false])])); return [2 /*return*/]; } }); @@ -227,7 +227,7 @@ function callExpression9() { _d = [[y]]; return [4 /*yield*/, z]; case 1: - _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([(_e.sent())]))])); + _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([(_e.sent()), false]))])); return [2 /*return*/]; } }); diff --git a/tests/baselines/reference/es5-asyncFunctionNewExpressions.js b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js index 93f6df8701405..0cbb4ce9adf62 100644 --- a/tests/baselines/reference/es5-asyncFunctionNewExpressions.js +++ b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js @@ -145,7 +145,7 @@ function newExpression4() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { switch (_a.label) { - case 0: return [4 /*yield*/, new (x.bind.apply(x, __spreadArray(__spreadArray([void 0], y), [z])))()]; + case 0: return [4 /*yield*/, new (x.bind.apply(x, __spreadArray(__spreadArray([void 0], y, false), [z], false)))()]; case 1: _a.sent(); return [2 /*return*/]; @@ -160,7 +160,7 @@ function newExpression5() { switch (_b.label) { case 0: return [4 /*yield*/, x]; case 1: - new ((_a = (_b.sent())).bind.apply(_a, __spreadArray(__spreadArray([void 0], y), [z])))(); + new ((_a = (_b.sent())).bind.apply(_a, __spreadArray(__spreadArray([void 0], y, false), [z], false)))(); return [2 /*return*/]; } }); @@ -177,7 +177,7 @@ function newExpression6() { _d = [[void 0]]; return [4 /*yield*/, y]; case 1: - new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, [__spreadArray.apply(void 0, _d.concat([(_e.sent())])), [z]])])))(); + new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, [__spreadArray.apply(void 0, _d.concat([(_e.sent()), false])), [z], false])])))(); return [2 /*return*/]; } }); @@ -191,10 +191,10 @@ function newExpression7() { case 0: _b = (_a = x.bind).apply; _c = [x]; - _d = [__spreadArray([void 0], y)]; + _d = [__spreadArray([void 0], y, false)]; return [4 /*yield*/, z]; case 1: - new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([[_e.sent()]]))])))(); + new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([[_e.sent()], false]))])))(); return [2 /*return*/]; } }); @@ -211,7 +211,7 @@ function newExpression8() { _d = [void 0]; return [4 /*yield*/, y]; case 1: - new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, [_d.concat([_e.sent()]), z])])))(); + new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, [_d.concat([_e.sent()]), z, false])])))(); return [2 /*return*/]; } }); @@ -228,7 +228,7 @@ function newExpression9() { _d = [[void 0, y]]; return [4 /*yield*/, z]; case 1: - new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([(_e.sent())]))])))(); + new (_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([(_e.sent()), false]))])))(); return [2 /*return*/]; } }); diff --git a/tests/baselines/reference/excessiveStackDepthFlatArray.js b/tests/baselines/reference/excessiveStackDepthFlatArray.js index 0f4f3d5aab8ef..e0f992bfee36e 100644 --- a/tests/baselines/reference/excessiveStackDepthFlatArray.js +++ b/tests/baselines/reference/excessiveStackDepthFlatArray.js @@ -42,7 +42,7 @@ const Component = () => { //// [index.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/excessivelyLargeTupleSpread.js b/tests/baselines/reference/excessivelyLargeTupleSpread.js index 71b41f9ef268d..c4ecd8e5291a0 100644 --- a/tests/baselines/reference/excessivelyLargeTupleSpread.js +++ b/tests/baselines/reference/excessivelyLargeTupleSpread.js @@ -42,7 +42,7 @@ const a14 = [...a13, ...a13] as const; // 2^14 > 10,000 //// [excessivelyLargeTupleSpread.js] // #41771 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/functionParameterArityMismatch.js b/tests/baselines/reference/functionParameterArityMismatch.js index 8072d304f1138..636bb1e3f7846 100644 --- a/tests/baselines/reference/functionParameterArityMismatch.js +++ b/tests/baselines/reference/functionParameterArityMismatch.js @@ -18,7 +18,7 @@ f2(...[1], 2, 3, 4, 5, 6); //// [functionParameterArityMismatch.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -33,4 +33,4 @@ f2(1); f2(1, 2, 3); f2(1, 2, 3, 4, 5); f2(1, 2, 3, 4, 5, 6, 7); -f2.apply(void 0, __spreadArray(__spreadArray([], [1]), [2, 3, 4, 5, 6])); +f2.apply(void 0, __spreadArray(__spreadArray([], [1], false), [2, 3, 4, 5, 6], false)); diff --git a/tests/baselines/reference/genericRestParameters1.js b/tests/baselines/reference/genericRestParameters1.js index 353cdb843f371..a658f27318300 100644 --- a/tests/baselines/reference/genericRestParameters1.js +++ b/tests/baselines/reference/genericRestParameters1.js @@ -168,7 +168,7 @@ ff1 = ff4; // Error //// [genericRestParameters1.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -181,48 +181,48 @@ f2 = f1; f1(42, "hello", true); f1(t3[0], t3[1], t3[2]); f1.apply(void 0, t3); -f1.apply(void 0, __spreadArray([42], t2)); -f1.apply(void 0, __spreadArray([42, "hello"], t1)); -f1.apply(void 0, __spreadArray([42, "hello", true], t0)); +f1.apply(void 0, __spreadArray([42], t2, false)); +f1.apply(void 0, __spreadArray([42, "hello"], t1, false)); +f1.apply(void 0, __spreadArray([42, "hello", true], t0, false)); f1(ns[0], ns[1], true); -f1.apply(void 0, __spreadArray(__spreadArray([], ns), [true])); // FIXME: Error, since ...ns is considered as string|number here +f1.apply(void 0, __spreadArray(__spreadArray([], ns, false), [true], false)); // FIXME: Error, since ...ns is considered as string|number here f2(42, "hello", true); f2(t3[0], t3[1], t3[2]); f2.apply(void 0, t3); -f2.apply(void 0, __spreadArray([42], t2)); -f2.apply(void 0, __spreadArray([42, "hello"], t1)); -f2.apply(void 0, __spreadArray([42, "hello", true], t0)); +f2.apply(void 0, __spreadArray([42], t2, false)); +f2.apply(void 0, __spreadArray([42, "hello"], t1, false)); +f2.apply(void 0, __spreadArray([42, "hello", true], t0, false)); f2(ns[0], ns[1], true); -f2.apply(void 0, __spreadArray(__spreadArray([], ns), [true])); // FIXME: Error, since ...ns is considered as string|number here +f2.apply(void 0, __spreadArray(__spreadArray([], ns, false), [true], false)); // FIXME: Error, since ...ns is considered as string|number here var x10 = f10(42, "hello", true); // [number, string, boolean] var x11 = f10(42, "hello"); // [number, string] var x12 = f10(42); // [number] var x13 = f10(); // [] var x14 = f10.apply(void 0, t3); // [number, string, boolean] -var x15 = f10.apply(void 0, __spreadArray([42], t2)); // [number, string, boolean] -var x16 = f10.apply(void 0, __spreadArray([42, "hello"], t1)); // [number, string, boolean] -var x17 = f10.apply(void 0, __spreadArray([42, "hello", true], t0)); // [number, string, boolean] -var x18 = f10.apply(void 0, __spreadArray(__spreadArray([], ns), [true])); // (string | number | boolean)[] +var x15 = f10.apply(void 0, __spreadArray([42], t2, false)); // [number, string, boolean] +var x16 = f10.apply(void 0, __spreadArray([42, "hello"], t1, false)); // [number, string, boolean] +var x17 = f10.apply(void 0, __spreadArray([42, "hello", true], t0, false)); // [number, string, boolean] +var x18 = f10.apply(void 0, __spreadArray(__spreadArray([], ns, false), [true], false)); // (string | number | boolean)[] function g10(u, v) { var x1 = f10.apply(void 0, u); // U var x2 = f10.apply(void 0, v); // V - var x3 = f10.apply(void 0, __spreadArray([1], u)); // [number, ...string[]] - var x4 = f10.apply(void 0, __spreadArray(__spreadArray([], u), v)); // (string | number)[] + var x3 = f10.apply(void 0, __spreadArray([1], u, false)); // [number, ...string[]] + var x4 = f10.apply(void 0, __spreadArray(__spreadArray([], u, false), v, false)); // (string | number)[] } var z10 = f11(42, "hello", true); // [42, "hello", true] var z11 = f11(42, "hello"); // [42, "hello"] var z12 = f11(42); // [42] var z13 = f11(); // [] var z14 = f11.apply(void 0, t3); // [number, string, boolean] -var z15 = f11.apply(void 0, __spreadArray([42], t2)); // [42, string, boolean] -var z16 = f11.apply(void 0, __spreadArray([42, "hello"], t1)); // [42, "hello", boolean] -var z17 = f11.apply(void 0, __spreadArray([42, "hello", true], t0)); // [42, "hello", true] -var z18 = f11.apply(void 0, __spreadArray(__spreadArray([], ns), [true])); // (string | number | true)[] +var z15 = f11.apply(void 0, __spreadArray([42], t2, false)); // [42, string, boolean] +var z16 = f11.apply(void 0, __spreadArray([42, "hello"], t1, false)); // [42, "hello", boolean] +var z17 = f11.apply(void 0, __spreadArray([42, "hello", true], t0, false)); // [42, "hello", true] +var z18 = f11.apply(void 0, __spreadArray(__spreadArray([], ns, false), [true], false)); // (string | number | true)[] function g11(u, v) { var x1 = f11.apply(void 0, u); // U var x2 = f11.apply(void 0, v); // V - var x3 = f11.apply(void 0, __spreadArray([1], u)); // [1, ...string[]] - var x4 = f11.apply(void 0, __spreadArray(__spreadArray([], u), v)); // (string | number)[] + var x3 = f11.apply(void 0, __spreadArray([1], u, false)); // [1, ...string[]] + var x4 = f11.apply(void 0, __spreadArray(__spreadArray([], u, false), v, false)); // (string | number)[] } function call(f) { var args = []; @@ -248,7 +248,7 @@ function bind(f, x) { for (var _i = 0; _i < arguments.length; _i++) { rest[_i] = arguments[_i]; } - return f.apply(void 0, __spreadArray([x], rest)); + return f.apply(void 0, __spreadArray([x], rest, false)); }; } var f21 = bind(f20, 42); // (y: string, z: boolean) => string[] diff --git a/tests/baselines/reference/genericRestParameters2.js b/tests/baselines/reference/genericRestParameters2.js index 8997b1c8d438b..fde77337a285d 100644 --- a/tests/baselines/reference/genericRestParameters2.js +++ b/tests/baselines/reference/genericRestParameters2.js @@ -82,7 +82,7 @@ type T12 = P1<(x: number, y: number) => void>; //// [genericRestParameters2.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -95,41 +95,41 @@ f10(42, "hello", true); f10(42, "hello", true, false); f10(t1[0], t1[1], t1[2], t1[3]); f10.apply(void 0, t1); -f10.apply(void 0, __spreadArray([42], t2)); -f10.apply(void 0, __spreadArray([42, "hello"], t3)); -f10.apply(void 0, __spreadArray([42, "hello", true], t4)); -f10.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4), [false]), t3)); +f10.apply(void 0, __spreadArray([42], t2, false)); +f10.apply(void 0, __spreadArray([42, "hello"], t3, false)); +f10.apply(void 0, __spreadArray([42, "hello", true], t4, false)); +f10.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4, false), [false], false), t3, false)); f11(42, "hello"); f11(42, "hello", true); f11(42, "hello", true, false); f11(t1[0], t1[1], t1[2], t1[3]); f11.apply(void 0, t1); -f11.apply(void 0, __spreadArray([42], t2)); -f11.apply(void 0, __spreadArray([42, "hello"], t3)); -f11.apply(void 0, __spreadArray([42, "hello", true], t4)); -f11.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4), [false]), t3)); +f11.apply(void 0, __spreadArray([42], t2, false)); +f11.apply(void 0, __spreadArray([42, "hello"], t3, false)); +f11.apply(void 0, __spreadArray([42, "hello", true], t4, false)); +f11.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4, false), [false], false), t3, false)); f12(42, "hello"); f12(42, "hello", true); f12(42, "hello", true, false); f12(t1[0], t1[1], t1[2], t1[3]); f12.apply(void 0, t1); -f12.apply(void 0, __spreadArray([42], t2)); -f12.apply(void 0, __spreadArray([42, "hello"], t3)); -f12.apply(void 0, __spreadArray([42, "hello", true], t4)); -f12.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4), [false]), t3)); +f12.apply(void 0, __spreadArray([42], t2, false)); +f12.apply(void 0, __spreadArray([42, "hello"], t3, false)); +f12.apply(void 0, __spreadArray([42, "hello", true], t4, false)); +f12.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4, false), [false], false), t3, false)); f13(42, "hello"); f13(42, "hello", true); f13(42, "hello", true, false); f13(t1[0], t1[1], t1[2], t1[3]); f13.apply(void 0, t1); -f13.apply(void 0, __spreadArray([42], t2)); -f13.apply(void 0, __spreadArray([42, "hello"], t3)); -f13.apply(void 0, __spreadArray([42, "hello", true], t4)); -f13.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4), [false]), t3)); +f13.apply(void 0, __spreadArray([42], t2, false)); +f13.apply(void 0, __spreadArray([42, "hello"], t3, false)); +f13.apply(void 0, __spreadArray([42, "hello", true], t4, false)); +f13.apply(void 0, __spreadArray(__spreadArray(__spreadArray([42, "hello", true], t4, false), [false], false), t3, false)); f20.apply(void 0, t1); -f20.apply(void 0, __spreadArray([42], t2)); -f20.apply(void 0, __spreadArray([42, "hello"], t3)); -f20.apply(void 0, __spreadArray(__spreadArray([42, "hello"], t2), [true])); +f20.apply(void 0, __spreadArray([42], t2, false)); +f20.apply(void 0, __spreadArray([42, "hello"], t3, false)); +f20.apply(void 0, __spreadArray(__spreadArray([42, "hello"], t2, false), [true], false)); //// [genericRestParameters2.d.ts] diff --git a/tests/baselines/reference/genericRestParameters3.js b/tests/baselines/reference/genericRestParameters3.js index ac91a5f2f5c8d..677933b466c23 100644 --- a/tests/baselines/reference/genericRestParameters3.js +++ b/tests/baselines/reference/genericRestParameters3.js @@ -69,7 +69,7 @@ foo2(...x2); //// [genericRestParameters3.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -79,10 +79,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { }; f1("foo", "abc"); f1("foo", 10, true); -f1.apply(void 0, __spreadArray(["foo"], t1)); -f1.apply(void 0, __spreadArray(["foo"], t2)); -f1.apply(void 0, __spreadArray(["foo"], t3)); -f1.apply(void 0, __spreadArray(["foo"], t4)); +f1.apply(void 0, __spreadArray(["foo"], t1, false)); +f1.apply(void 0, __spreadArray(["foo"], t2, false)); +f1.apply(void 0, __spreadArray(["foo"], t3, false)); +f1.apply(void 0, __spreadArray(["foo"], t4, false)); f1("foo", 10); // Error f1("foo"); // Error f2 = f1; diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js index da91f17a5f5a2..1f89668712d0a 100644 --- a/tests/baselines/reference/keyofAndIndexedAccess.js +++ b/tests/baselines/reference/keyofAndIndexedAccess.js @@ -675,7 +675,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -962,7 +962,7 @@ function f1(thing) { var x1 = path(thing, 'a'); // { x: number, y: string } var x2 = path(thing, 'a', 'y'); // string var x3 = path(thing, 'b'); // boolean - var x4 = path.apply(void 0, __spreadArray([thing], ['a', 'x'])); // any + var x4 = path.apply(void 0, __spreadArray([thing], ['a', 'x'], false)); // any } // Repro from comment in #12114 var assignTo2 = function (object, key1, key2) { diff --git a/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.js b/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.js index 6d53d16d217cd..abe7c41bc9696 100644 --- a/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.js +++ b/tests/baselines/reference/literalFreshnessPropagationOnNarrowing.js @@ -63,7 +63,7 @@ function f5() { //// [literalFreshnessPropagationOnNarrowing.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js index ab044ea37dd8d..16a1051934c0b 100644 --- a/tests/baselines/reference/newWithSpread.js +++ b/tests/baselines/reference/newWithSpread.js @@ -98,7 +98,7 @@ new i["a-b"][1](1, 2, ...a, "string"); //// [newWithSpread.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -138,52 +138,52 @@ var h; var i; // Basic expression new f(1, 2, "string"); -new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a)))(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a, false)))(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Multiple spreads arguments -new (f2.bind.apply(f2, __spreadArray(__spreadArray([void 0], a), a)))(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), a)))(); +new (f2.bind.apply(f2, __spreadArray(__spreadArray([void 0], a, false), a, false)))(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), a, false)))(); // Call expression new f(1, 2, "string")(); -new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a)))()(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))()(); +new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a, false)))()(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))()(); // Property access expression new b.f(1, 2, "string"); -new ((_a = b.f).bind.apply(_a, __spreadArray([void 0, 1, 2], a)))(); -new ((_b = b.f).bind.apply(_b, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_a = b.f).bind.apply(_a, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_b = b.f).bind.apply(_b, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Parenthesised expression new (b.f)(1, 2, "string"); -new ((_c = (b.f)).bind.apply(_c, __spreadArray([void 0, 1, 2], a)))(); -new ((_d = (b.f)).bind.apply(_d, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_c = (b.f)).bind.apply(_c, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_d = (b.f)).bind.apply(_d, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression new d[1].f(1, 2, "string"); -new ((_e = d[1].f).bind.apply(_e, __spreadArray([void 0, 1, 2], a)))(); -new ((_f = d[1].f).bind.apply(_f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_e = d[1].f).bind.apply(_e, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_f = d[1].f).bind.apply(_f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a punctuated key new e["a-b"].f(1, 2, "string"); -new ((_g = e["a-b"].f).bind.apply(_g, __spreadArray([void 0, 1, 2], a)))(); -new ((_h = e["a-b"].f).bind.apply(_h, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_g = e["a-b"].f).bind.apply(_g, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_h = e["a-b"].f).bind.apply(_h, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Basic expression new B(1, 2, "string"); -new (B.bind.apply(B, __spreadArray([void 0, 1, 2], a)))(); -new (B.bind.apply(B, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new (B.bind.apply(B, __spreadArray([void 0, 1, 2], a, false)))(); +new (B.bind.apply(B, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Property access expression new c["a-b"](1, 2, "string"); -new ((_j = c["a-b"]).bind.apply(_j, __spreadArray([void 0, 1, 2], a)))(); -new ((_k = c["a-b"]).bind.apply(_k, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_j = c["a-b"]).bind.apply(_j, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_k = c["a-b"]).bind.apply(_k, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Parenthesised expression new (c["a-b"])(1, 2, "string"); -new ((_l = (c["a-b"])).bind.apply(_l, __spreadArray([void 0, 1, 2], a)))(); -new ((_m = (c["a-b"])).bind.apply(_m, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_l = (c["a-b"])).bind.apply(_l, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_m = (c["a-b"])).bind.apply(_m, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression new g[1]["a-b"](1, 2, "string"); -new ((_o = g[1]["a-b"]).bind.apply(_o, __spreadArray([void 0, 1, 2], a)))(); -new ((_p = g[1]["a-b"]).bind.apply(_p, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_o = g[1]["a-b"]).bind.apply(_o, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_p = g[1]["a-b"]).bind.apply(_p, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a punctuated key new h["a-b"]["a-b"](1, 2, "string"); -new ((_q = h["a-b"]["a-b"]).bind.apply(_q, __spreadArray([void 0, 1, 2], a)))(); -new ((_r = h["a-b"]["a-b"]).bind.apply(_r, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_q = h["a-b"]["a-b"]).bind.apply(_q, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_r = h["a-b"]["a-b"]).bind.apply(_r, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a number new i["a-b"][1](1, 2, "string"); -new ((_s = i["a-b"][1]).bind.apply(_s, __spreadArray([void 0, 1, 2], a)))(); -new ((_t = i["a-b"][1]).bind.apply(_t, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_s = i["a-b"][1]).bind.apply(_s, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_t = i["a-b"][1]).bind.apply(_t, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js index 4496a02086a47..2dcfca820b506 100644 --- a/tests/baselines/reference/newWithSpreadES5.js +++ b/tests/baselines/reference/newWithSpreadES5.js @@ -97,7 +97,7 @@ new i["a-b"][1](1, 2, ...a, "string"); //// [newWithSpreadES5.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -137,52 +137,52 @@ var h; var i; // Basic expression new f(1, 2, "string"); -new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a)))(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a, false)))(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Multiple spreads arguments -new (f2.bind.apply(f2, __spreadArray(__spreadArray([void 0], a), a)))(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), a)))(); +new (f2.bind.apply(f2, __spreadArray(__spreadArray([void 0], a, false), a, false)))(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), a, false)))(); // Call expression new f(1, 2, "string")(); -new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a)))()(); -new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))()(); +new (f.bind.apply(f, __spreadArray([void 0, 1, 2], a, false)))()(); +new (f.bind.apply(f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))()(); // Property access expression new b.f(1, 2, "string"); -new ((_a = b.f).bind.apply(_a, __spreadArray([void 0, 1, 2], a)))(); -new ((_b = b.f).bind.apply(_b, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_a = b.f).bind.apply(_a, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_b = b.f).bind.apply(_b, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Parenthesised expression new (b.f)(1, 2, "string"); -new ((_c = (b.f)).bind.apply(_c, __spreadArray([void 0, 1, 2], a)))(); -new ((_d = (b.f)).bind.apply(_d, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_c = (b.f)).bind.apply(_c, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_d = (b.f)).bind.apply(_d, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression new d[1].f(1, 2, "string"); -new ((_e = d[1].f).bind.apply(_e, __spreadArray([void 0, 1, 2], a)))(); -new ((_f = d[1].f).bind.apply(_f, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_e = d[1].f).bind.apply(_e, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_f = d[1].f).bind.apply(_f, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a punctuated key new e["a-b"].f(1, 2, "string"); -new ((_g = e["a-b"].f).bind.apply(_g, __spreadArray([void 0, 1, 2], a)))(); -new ((_h = e["a-b"].f).bind.apply(_h, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_g = e["a-b"].f).bind.apply(_g, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_h = e["a-b"].f).bind.apply(_h, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Basic expression new B(1, 2, "string"); -new (B.bind.apply(B, __spreadArray([void 0, 1, 2], a)))(); -new (B.bind.apply(B, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new (B.bind.apply(B, __spreadArray([void 0, 1, 2], a, false)))(); +new (B.bind.apply(B, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Property access expression new c["a-b"](1, 2, "string"); -new ((_j = c["a-b"]).bind.apply(_j, __spreadArray([void 0, 1, 2], a)))(); -new ((_k = c["a-b"]).bind.apply(_k, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_j = c["a-b"]).bind.apply(_j, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_k = c["a-b"]).bind.apply(_k, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Parenthesised expression new (c["a-b"])(1, 2, "string"); -new ((_l = (c["a-b"])).bind.apply(_l, __spreadArray([void 0, 1, 2], a)))(); -new ((_m = (c["a-b"])).bind.apply(_m, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_l = (c["a-b"])).bind.apply(_l, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_m = (c["a-b"])).bind.apply(_m, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression new g[1]["a-b"](1, 2, "string"); -new ((_o = g[1]["a-b"]).bind.apply(_o, __spreadArray([void 0, 1, 2], a)))(); -new ((_p = g[1]["a-b"]).bind.apply(_p, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_o = g[1]["a-b"]).bind.apply(_o, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_p = g[1]["a-b"]).bind.apply(_p, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a punctuated key new h["a-b"]["a-b"](1, 2, "string"); -new ((_q = h["a-b"]["a-b"]).bind.apply(_q, __spreadArray([void 0, 1, 2], a)))(); -new ((_r = h["a-b"]["a-b"]).bind.apply(_r, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_q = h["a-b"]["a-b"]).bind.apply(_q, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_r = h["a-b"]["a-b"]).bind.apply(_r, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); // Element access expression with a number new i["a-b"][1](1, 2, "string"); -new ((_s = i["a-b"][1]).bind.apply(_s, __spreadArray([void 0, 1, 2], a)))(); -new ((_t = i["a-b"][1]).bind.apply(_t, __spreadArray(__spreadArray([void 0, 1, 2], a), ["string"])))(); +new ((_s = i["a-b"][1]).bind.apply(_s, __spreadArray([void 0, 1, 2], a, false)))(); +new ((_t = i["a-b"][1]).bind.apply(_t, __spreadArray(__spreadArray([void 0, 1, 2], a, false), ["string"], false)))(); diff --git a/tests/baselines/reference/noCrashOnNoLib.js b/tests/baselines/reference/noCrashOnNoLib.js index acca4ab8710e7..b8fd1f2b5521b 100644 --- a/tests/baselines/reference/noCrashOnNoLib.js +++ b/tests/baselines/reference/noCrashOnNoLib.js @@ -9,7 +9,7 @@ export function f() { //// [noCrashOnNoLib.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/operationsAvailableOnPromisedType.js b/tests/baselines/reference/operationsAvailableOnPromisedType.js index 4a4e2d53baec9..34fe3e191f603 100644 --- a/tests/baselines/reference/operationsAvailableOnPromisedType.js +++ b/tests/baselines/reference/operationsAvailableOnPromisedType.js @@ -74,7 +74,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) { function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); } }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/readonlyRestParameters.js b/tests/baselines/reference/readonlyRestParameters.js index 4f514d239d88e..37b2accd28dc0 100644 --- a/tests/baselines/reference/readonlyRestParameters.js +++ b/tests/baselines/reference/readonlyRestParameters.js @@ -30,7 +30,7 @@ function f4(...args: readonly string[]) { //// [readonlyRestParameters.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -50,7 +50,7 @@ function f1() { } f0.apply(void 0, args); // Error f1('abc', 'def'); - f1.apply(void 0, __spreadArray(['abc'], args)); + f1.apply(void 0, __spreadArray(['abc'], args, false)); f1.apply(void 0, args); } function f2() { @@ -60,10 +60,10 @@ function f2() { } f0.apply(void 0, args); f1('abc', 'def'); - f1.apply(void 0, __spreadArray(['abc'], args)); + f1.apply(void 0, __spreadArray(['abc'], args, false)); f1.apply(void 0, args); f2('abc', 'def'); - f2.apply(void 0, __spreadArray(['abc'], args)); // Error + f2.apply(void 0, __spreadArray(['abc'], args, false)); // Error f2.apply(void 0, args); } function f4() { diff --git a/tests/baselines/reference/recursiveReverseMappedType.js b/tests/baselines/reference/recursiveReverseMappedType.js index 94a78b9670ce7..0be51c1c9b69f 100644 --- a/tests/baselines/reference/recursiveReverseMappedType.js +++ b/tests/baselines/reference/recursiveReverseMappedType.js @@ -18,7 +18,7 @@ function a(l: Recur[]): void { "use strict"; // Repro from #38198 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/recursiveTypeReferences1.js b/tests/baselines/reference/recursiveTypeReferences1.js index 8ea8c081d1e1e..688e6531ffef4 100644 --- a/tests/baselines/reference/recursiveTypeReferences1.js +++ b/tests/baselines/reference/recursiveTypeReferences1.js @@ -133,7 +133,7 @@ function level(h: HTMLHeadingElement): number { //// [recursiveTypeReferences1.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -189,7 +189,7 @@ function parse(node, index) { if (index === void 0) { index = []; } return html('ul', node.map(function (_a, i) { var el = _a[0], children = _a[1]; - var idx = __spreadArray(__spreadArray([], index, true), [i + 1]); + var idx = __spreadArray(__spreadArray([], index, true), [i + 1], false); return html('li', [ html('a', { href: "#" + el.id, rel: 'noopener', 'data-index': idx.join('.') }, el.textContent), children.length > 0 ? parse(children, idx) : frag() diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.js b/tests/baselines/reference/restTuplesFromContextualTypes.js index 896f05197b3c9..39ac99b47ccf4 100644 --- a/tests/baselines/reference/restTuplesFromContextualTypes.js +++ b/tests/baselines/reference/restTuplesFromContextualTypes.js @@ -102,7 +102,7 @@ const funcUnionTupleRest: TupleUnionFunc = (...params) => { //// [restTuplesFromContextualTypes.js] "use strict"; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -210,31 +210,31 @@ f2(function (a, b, c) { x[_i - 3] = arguments[_i]; } }); -(function (a, b, c) { }).apply(void 0, __spreadArray([1], t3)); +(function (a, b, c) { }).apply(void 0, __spreadArray([1], t3, false)); (function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { x[_i] = arguments[_i]; } -}).apply(void 0, __spreadArray([1], t3)); +}).apply(void 0, __spreadArray([1], t3, false)); (function (a) { var x = []; for (var _i = 1; _i < arguments.length; _i++) { x[_i - 1] = arguments[_i]; } -}).apply(void 0, __spreadArray([1], t3)); +}).apply(void 0, __spreadArray([1], t3, false)); (function (a, b) { var x = []; for (var _i = 2; _i < arguments.length; _i++) { x[_i - 2] = arguments[_i]; } -}).apply(void 0, __spreadArray([1], t3)); +}).apply(void 0, __spreadArray([1], t3, false)); (function (a, b, c) { var x = []; for (var _i = 3; _i < arguments.length; _i++) { x[_i - 3] = arguments[_i]; } -}).apply(void 0, __spreadArray([1], t3)); +}).apply(void 0, __spreadArray([1], t3, false)); f3(function (a, b, c) { }); f3(function () { var x = []; @@ -272,13 +272,13 @@ function f4(t) { for (var _i = 1; _i < arguments.length; _i++) { x[_i - 1] = arguments[_i]; } - }).apply(void 0, __spreadArray([1], t)); + }).apply(void 0, __spreadArray([1], t, false)); (function (a) { var x = []; for (var _i = 1; _i < arguments.length; _i++) { x[_i - 1] = arguments[_i]; } - }).apply(void 0, __spreadArray([1, 2], t)); + }).apply(void 0, __spreadArray([1, 2], t, false)); function f(cb) { } f(function () { var x = []; diff --git a/tests/baselines/reference/selfReferencingSpreadInLoop.js b/tests/baselines/reference/selfReferencingSpreadInLoop.js index 428c5194f2ed9..e31fb10f01139 100644 --- a/tests/baselines/reference/selfReferencingSpreadInLoop.js +++ b/tests/baselines/reference/selfReferencingSpreadInLoop.js @@ -7,7 +7,7 @@ for (const subcomponent of [1, 2, 3]) { //// [selfReferencingSpreadInLoop.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -18,5 +18,5 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { var additional = []; for (var _i = 0, _a = [1, 2, 3]; _i < _a.length; _i++) { var subcomponent = _a[_i]; - additional = __spreadArray(__spreadArray([], additional, true), [subcomponent]); + additional = __spreadArray(__spreadArray([], additional, true), [subcomponent], false); } diff --git a/tests/baselines/reference/spliceTuples.js b/tests/baselines/reference/spliceTuples.js index 850faad6a5146..584392e4594fe 100644 --- a/tests/baselines/reference/spliceTuples.js +++ b/tests/baselines/reference/spliceTuples.js @@ -26,7 +26,7 @@ k6 = [1, ...sbb_]; //// [spliceTuples.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -37,7 +37,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { var k1; k1 = __spreadArray([1], sb, true); var k2; -k2 = __spreadArray(__spreadArray([1], sb, true), [1]); +k2 = __spreadArray(__spreadArray([1], sb, true), [1], false); var k3; k3 = __spreadArray([1], sb_, true); var k4; diff --git a/tests/baselines/reference/spreadBooleanRespectsFreshness.js b/tests/baselines/reference/spreadBooleanRespectsFreshness.js index ac57c8b47ee60..6b117d6155c8d 100644 --- a/tests/baselines/reference/spreadBooleanRespectsFreshness.js +++ b/tests/baselines/reference/spreadBooleanRespectsFreshness.js @@ -9,7 +9,7 @@ foo1 = [...Array.isArray(foo2) ? foo2 : [foo2]]; //// [spreadBooleanRespectsFreshness.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 83c11d4bb0c6f..9344deb262d81 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -43,7 +43,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -70,7 +70,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -105,11 +105,11 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); //# sourceMappingURL=module.js.map //// [/src/app/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICFH,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICFH,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE"} //// [/src/app/module.js.map.baseline.txt] =================================================================== @@ -139,7 +139,7 @@ sourceFile:../lib/file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -249,7 +249,7 @@ sourceFile:../lib/file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -272,14 +272,14 @@ sourceFile:../lib/file0.ts 9 >Emitted(44, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(44, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -294,7 +294,7 @@ sourceFile:../lib/file0.ts 4 >Emitted(45, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(45, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(45, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(45, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(45, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/app/module.js @@ -731,7 +731,7 @@ sourceFile:file4.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -754,14 +754,14 @@ sourceFile:file4.ts 9 >Emitted(79, 27) Source(3, 29) + SourceIndex(5) 10>Emitted(79, 28) Source(3, 30) + SourceIndex(5) --- ->>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +>>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >appfile4Spread @@ -776,12 +776,12 @@ sourceFile:file4.ts 4 >Emitted(80, 47) Source(4, 18) + SourceIndex(5) 5 >Emitted(80, 57) Source(4, 23) + SourceIndex(5) 6 >Emitted(80, 68) Source(4, 34) + SourceIndex(5) -7 >Emitted(80, 72) Source(4, 36) + SourceIndex(5) +7 >Emitted(80, 79) Source(4, 36) + SourceIndex(5) --- >>>//# sourceMappingURL=module.js.map //// [/src/app/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":2196,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1344,"end":2196,"kind":"text"}]},{"pos":2196,"end":2786,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":2229,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1370,"end":2229,"kind":"text"}]},{"pos":2229,"end":2826,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/app/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -805,9 +805,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -816,7 +816,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -829,9 +829,9 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1344-2196):: ../lib/module.js texts:: 1 +prepend: (1370-2229):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-2196) +text: (1370-2229) var myGlob = 20; function libfile0Spread() { var b = []; @@ -840,7 +840,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -860,7 +860,7 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; ---------------------------------------------------------------------- -text: (2196-2786) +text: (2229-2826) define("file3", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -878,7 +878,7 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); ====================================================================== ====================================================================== @@ -927,32 +927,32 @@ declare const appfile4_ar: number[]; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 2196, + "pos": 1370, + "end": 2229, "kind": "prepend", "data": "../lib/module.js", "texts": [ { - "pos": 1344, - "end": 2196, + "pos": 1370, + "end": 2229, "kind": "text" } ] }, { - "pos": 2196, - "end": 2786, + "pos": 2229, + "end": 2826, "kind": "text" } ], @@ -1012,7 +1012,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1039,7 +1039,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1060,7 +1060,7 @@ var globalConst = 10; //# sourceMappingURL=module.js.map //// [/src/lib/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICFH,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICFH,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} //// [/src/lib/module.js.map.baseline.txt] =================================================================== @@ -1090,7 +1090,7 @@ sourceFile:file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1200,7 +1200,7 @@ sourceFile:file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1223,14 +1223,14 @@ sourceFile:file0.ts 9 >Emitted(44, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(44, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -1245,7 +1245,7 @@ sourceFile:file0.ts 4 >Emitted(45, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(45, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(45, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(45, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(45, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.js @@ -1460,7 +1460,7 @@ sourceFile:global.ts >>>//# sourceMappingURL=module.js.map //// [/src/lib/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":2196,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray","typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":2229,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray","typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/lib/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -1484,9 +1484,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1495,7 +1495,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -1508,7 +1508,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -text: (1344-2196) +text: (1370-2229) var myGlob = 20; function libfile0Spread() { var b = []; @@ -1517,7 +1517,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1574,19 +1574,19 @@ declare const globalConst = 10; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 2196, + "pos": 1370, + "end": 2229, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index 1527355f0d7a8..83e0e630fe359 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -41,7 +41,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -68,7 +68,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -100,11 +100,11 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); //# sourceMappingURL=module.js.map //// [/src/app/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe,KAAK,CAAC;;;;;;ICArC,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe,KAAK,CAAC;;;;;;ICArC,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE"} //// [/src/app/module.js.map.baseline.txt] =================================================================== @@ -134,7 +134,7 @@ sourceFile:../lib/file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -244,7 +244,7 @@ sourceFile:../lib/file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -267,14 +267,14 @@ sourceFile:../lib/file0.ts 9 >Emitted(44, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(44, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -289,7 +289,7 @@ sourceFile:../lib/file0.ts 4 >Emitted(45, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(45, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(45, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(45, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(45, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/app/module.js @@ -617,7 +617,7 @@ sourceFile:file4.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -640,14 +640,14 @@ sourceFile:file4.ts 9 >Emitted(76, 27) Source(3, 29) + SourceIndex(5) 10>Emitted(76, 28) Source(3, 30) + SourceIndex(5) --- ->>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +>>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >appfile4Spread @@ -662,12 +662,12 @@ sourceFile:file4.ts 4 >Emitted(77, 47) Source(4, 18) + SourceIndex(5) 5 >Emitted(77, 57) Source(4, 23) + SourceIndex(5) 6 >Emitted(77, 68) Source(4, 34) + SourceIndex(5) -7 >Emitted(77, 72) Source(4, 36) + SourceIndex(5) +7 >Emitted(77, 79) Source(4, 36) + SourceIndex(5) --- >>>//# sourceMappingURL=module.js.map //// [/src/app/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":2082,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1344,"end":2082,"kind":"text"}]},{"pos":2082,"end":2672,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":2115,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1370,"end":2115,"kind":"text"}]},{"pos":2115,"end":2712,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/app/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -691,9 +691,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -702,7 +702,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -715,9 +715,9 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1344-2082):: ../lib/module.js texts:: 1 +prepend: (1370-2115):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-2082) +text: (1370-2115) var myGlob = 20; function libfile0Spread() { var b = []; @@ -726,7 +726,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -743,7 +743,7 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; ---------------------------------------------------------------------- -text: (2082-2672) +text: (2115-2712) define("file3", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -761,7 +761,7 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); ====================================================================== ====================================================================== @@ -810,32 +810,32 @@ declare const appfile4_ar: number[]; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 2082, + "pos": 1370, + "end": 2115, "kind": "prepend", "data": "../lib/module.js", "texts": [ { - "pos": 1344, - "end": 2082, + "pos": 1370, + "end": 2115, "kind": "text" } ] }, { - "pos": 2082, - "end": 2672, + "pos": 2115, + "end": 2712, "kind": "text" } ], @@ -895,7 +895,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -911,7 +911,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -929,7 +929,7 @@ var globalConst = 10; //# sourceMappingURL=module.js.map //// [/src/lib/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe,KAAK,CAAC;;;;;;ICArC,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe,KAAK,CAAC;;;;;;ICArC,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} //// [/src/lib/module.js.map.baseline.txt] =================================================================== @@ -959,7 +959,7 @@ sourceFile:file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1058,7 +1058,7 @@ sourceFile:file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1081,14 +1081,14 @@ sourceFile:file0.ts 9 >Emitted(33, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(33, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -1103,7 +1103,7 @@ sourceFile:file0.ts 4 >Emitted(34, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(34, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(34, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(34, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(34, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.js @@ -1209,7 +1209,7 @@ sourceFile:global.ts >>>//# sourceMappingURL=module.js.map //// [/src/lib/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1580,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1613,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/lib/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -1233,9 +1233,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1244,7 +1244,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (842-1580) +text: (868-1613) var myGlob = 20; function libfile0Spread() { var b = []; @@ -1253,7 +1253,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1307,13 +1307,13 @@ declare const globalConst = 10; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1580, + "pos": 868, + "end": 1613, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-build/multiple-emitHelpers-in-all-projects.js index b9263d21c81ed..408ca4196ab93 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-build/multiple-emitHelpers-in-all-projects.js @@ -408,7 +408,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -435,7 +435,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -469,11 +469,11 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); //# sourceMappingURL=module.js.map //// [/src/app/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;;;;;ICFY,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["../lib/file0.ts","../lib/file1.ts","../lib/file2.ts","../lib/global.ts","file3.ts","file4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;;;;;ICFY,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC;;;;;ICAV,QAAA,CAAC,GAAG,EAAE,CAAC;IACM,SAAS,eAAe;QAClD,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;ACHD,IAAM,KAAK,GAAG,EAAE,CAAC;AACjB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE"} //// [/src/app/module.js.map.baseline.txt] =================================================================== @@ -503,7 +503,7 @@ sourceFile:../lib/file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -613,7 +613,7 @@ sourceFile:../lib/file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -636,14 +636,14 @@ sourceFile:../lib/file0.ts 9 >Emitted(44, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(44, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -658,7 +658,7 @@ sourceFile:../lib/file0.ts 4 >Emitted(45, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(45, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(45, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(45, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(45, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/app/module.js @@ -1068,7 +1068,7 @@ sourceFile:file4.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1091,14 +1091,14 @@ sourceFile:file4.ts 9 >Emitted(78, 27) Source(3, 29) + SourceIndex(5) 10>Emitted(78, 28) Source(3, 30) + SourceIndex(5) --- ->>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +>>>appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >appfile4Spread @@ -1113,12 +1113,12 @@ sourceFile:file4.ts 4 >Emitted(79, 47) Source(4, 18) + SourceIndex(5) 5 >Emitted(79, 57) Source(4, 23) + SourceIndex(5) 6 >Emitted(79, 68) Source(4, 34) + SourceIndex(5) -7 >Emitted(79, 72) Source(4, 36) + SourceIndex(5) +7 >Emitted(79, 79) Source(4, 36) + SourceIndex(5) --- >>>//# sourceMappingURL=module.js.map //// [/src/app/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":2167,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1344,"end":2167,"kind":"text"}]},{"pos":2167,"end":2757,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file3.ts","./file4.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":2200,"kind":"prepend","data":"../lib/module.js","texts":[{"pos":1370,"end":2200,"kind":"text"}]},{"pos":2200,"end":2797,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"prepend","data":"../lib/module.d.ts","texts":[{"pos":0,"end":265,"kind":"text"}]},{"pos":265,"end":441,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/app/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -1142,9 +1142,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1153,7 +1153,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -1166,9 +1166,9 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1344-2167):: ../lib/module.js texts:: 1 +prepend: (1370-2200):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-2167) +text: (1370-2200) var myGlob = 20; function libfile0Spread() { var b = []; @@ -1177,7 +1177,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1196,7 +1196,7 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; ---------------------------------------------------------------------- -text: (2167-2757) +text: (2200-2797) define("file3", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1214,7 +1214,7 @@ function appfile4Spread() { } } var appfile4_ar = [20, 30]; -appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar))); +appfile4Spread.apply(void 0, __spreadArray([10], __read(appfile4_ar), false)); ====================================================================== ====================================================================== @@ -1263,32 +1263,32 @@ declare const appfile4_ar: number[]; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 2167, + "pos": 1370, + "end": 2200, "kind": "prepend", "data": "../lib/module.js", "texts": [ { - "pos": 1344, - "end": 2167, + "pos": 1370, + "end": 2200, "kind": "text" } ] }, { - "pos": 2167, - "end": 2757, + "pos": 2200, + "end": 2797, "kind": "text" } ], @@ -1529,7 +1529,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1556,7 +1556,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -1576,7 +1576,7 @@ var globalConst = 10; //# sourceMappingURL=module.js.map //// [/src/lib/module.js.map] -{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,IAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;;;;;ICFY,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} +{"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;AAClB,SAAS,cAAc;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AAC3C,IAAM,WAAW,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7B,cAAc,8BAAC,EAAE,UAAK,WAAW,WAAE;;;;;ICHtB,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,SAAS,eAAe;QAC5C,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;IAChD,CAAC;;;;;;ICFY,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} //// [/src/lib/module.js.map.baseline.txt] =================================================================== @@ -1606,7 +1606,7 @@ sourceFile:file0.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1716,7 +1716,7 @@ sourceFile:file0.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1739,14 +1739,14 @@ sourceFile:file0.ts 9 >Emitted(44, 27) Source(3, 29) + SourceIndex(0) 10>Emitted(44, 28) Source(3, 30) + SourceIndex(0) --- ->>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +>>>libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); 1-> 2 >^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >libfile0Spread @@ -1761,7 +1761,7 @@ sourceFile:file0.ts 4 >Emitted(45, 47) Source(4, 18) + SourceIndex(0) 5 >Emitted(45, 57) Source(4, 23) + SourceIndex(0) 6 >Emitted(45, 68) Source(4, 34) + SourceIndex(0) -7 >Emitted(45, 72) Source(4, 36) + SourceIndex(0) +7 >Emitted(45, 79) Source(4, 36) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.js @@ -1949,7 +1949,7 @@ sourceFile:global.ts >>>//# sourceMappingURL=module.js.map //// [/src/lib/module.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":2167,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray","typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./file0.ts","./file1.ts","./file2.ts","./global.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":2200,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray","typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":265,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/lib/module.tsbuildinfo.baseline.txt] ====================================================================== @@ -1973,9 +1973,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1984,7 +1984,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -1997,7 +1997,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -text: (1344-2167) +text: (1370-2200) var myGlob = 20; function libfile0Spread() { var b = []; @@ -2006,7 +2006,7 @@ function libfile0Spread() { } } var libfile0_ar = [20, 30]; -libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar))); +libfile0Spread.apply(void 0, __spreadArray([10], __read(libfile0_ar), false)); define("file1", ["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -2062,19 +2062,19 @@ declare const globalConst = 10; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 2167, + "pos": 1370, + "end": 2200, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 9c49ef4e47d05..dc75b556bc9ed 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -71,7 +71,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -96,11 +96,11 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); //# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.js.map] -{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== @@ -141,7 +141,7 @@ sourceFile:../first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -478,7 +478,7 @@ sourceFile:../first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -501,14 +501,14 @@ sourceFile:../first_part3.ts 9 >Emitted(53, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(53, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -523,12 +523,12 @@ sourceFile:../first_part3.ts 4 >Emitted(54, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(54, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(54, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(54, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(54, 95) Source(6, 52) + SourceIndex(2) --- >>>//# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1863,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1896,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/first/bin/first-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -565,9 +565,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -576,7 +576,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (1344-1863) +text: (1370-1896) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -594,7 +594,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ====================================================================== ====================================================================== @@ -640,13 +640,13 @@ declare const firstfirst_part3_ar: number[]; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1863, + "pos": 1370, + "end": 1896, "kind": "text" } ], @@ -701,7 +701,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -726,7 +726,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); var N; (function (N) { function f() { @@ -752,7 +752,7 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -765,11 +765,11 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -810,7 +810,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1147,7 +1147,7 @@ sourceFile:../../../first/first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1170,14 +1170,14 @@ sourceFile:../../../first/first_part3.ts 9 >Emitted(53, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(53, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -1192,7 +1192,7 @@ sourceFile:../../../first/first_part3.ts 4 >Emitted(54, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(54, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(54, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(54, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(54, 95) Source(6, 52) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1611,7 +1611,7 @@ sourceFile:../../../second/second_part2.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1634,14 +1634,14 @@ sourceFile:../../../second/second_part2.ts 9 >Emitted(79, 37) Source(8, 39) + SourceIndex(4) 10>Emitted(79, 38) Source(8, 40) + SourceIndex(4) --- ->>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +>>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part2Spread @@ -1656,7 +1656,7 @@ sourceFile:../../../second/second_part2.ts 4 >Emitted(80, 57) Source(9, 28) + SourceIndex(4) 5 >Emitted(80, 67) Source(9, 33) + SourceIndex(4) 6 >Emitted(80, 88) Source(9, 54) + SourceIndex(4) -7 >Emitted(80, 92) Source(9, 56) + SourceIndex(4) +7 >Emitted(80, 99) Source(9, 56) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1882,7 +1882,7 @@ sourceFile:../../third_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1905,14 +1905,14 @@ sourceFile:../../third_part1.ts 9 >Emitted(92, 35) Source(7, 37) + SourceIndex(5) 10>Emitted(92, 36) Source(7, 38) + SourceIndex(5) --- ->>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +>>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >thirdthird_part1Spread @@ -1927,12 +1927,12 @@ sourceFile:../../third_part1.ts 4 >Emitted(93, 55) Source(8, 26) + SourceIndex(5) 5 >Emitted(93, 65) Source(8, 31) + SourceIndex(5) 6 >Emitted(93, 84) Source(8, 50) + SourceIndex(5) -7 >Emitted(93, 88) Source(8, 52) + SourceIndex(5) +7 >Emitted(93, 95) Source(8, 52) + SourceIndex(5) --- >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1863,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1863,"kind":"text"}]},{"pos":1863,"end":2550,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1863,"end":2550,"kind":"text"}]},{"pos":2550,"end":2978,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1896,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1896,"kind":"text"}]},{"pos":1896,"end":2590,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1896,"end":2590,"kind":"text"}]},{"pos":2590,"end":3025,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -1969,9 +1969,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1980,9 +1980,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -prepend: (1344-1863):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1896):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1863) +text: (1370-1896) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -2000,12 +2000,12 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ---------------------------------------------------------------------- -prepend: (1863-2550):: ../../../2/second-output.js texts:: 1 +prepend: (1896-2590):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1863-2550) +text: (1896-2590) var N; (function (N) { function f() { @@ -2031,10 +2031,10 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); ---------------------------------------------------------------------- -text: (2550-2978) +text: (2590-3025) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -2047,7 +2047,7 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); ====================================================================== ====================================================================== @@ -2115,39 +2115,39 @@ declare const thirdthird_part1_ar: number[]; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1863, + "pos": 1370, + "end": 1896, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1863, + "pos": 1370, + "end": 1896, "kind": "text" } ] }, { - "pos": 1863, - "end": 2550, + "pos": 1896, + "end": 2590, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1863, - "end": 2550, + "pos": 1896, + "end": 2590, "kind": "text" } ] }, { - "pos": 2550, - "end": 2978, + "pos": 2590, + "end": 3025, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js index 37064d7bb24cc..0829d7781cf35 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js @@ -473,7 +473,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -505,7 +505,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -522,7 +522,7 @@ function forthirdthird_part1Rest() { //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACbhB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -563,7 +563,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1040,7 +1040,7 @@ sourceFile:../../../second/second_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1063,14 +1063,14 @@ sourceFile:../../../second/second_part1.ts 9 >Emitted(60, 37) Source(14, 39) + SourceIndex(3) 10>Emitted(60, 38) Source(14, 40) + SourceIndex(3) --- ->>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +>>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part1Spread @@ -1085,7 +1085,7 @@ sourceFile:../../../second/second_part1.ts 4 >Emitted(61, 57) Source(15, 28) + SourceIndex(3) 5 >Emitted(61, 67) Source(15, 33) + SourceIndex(3) 6 >Emitted(61, 88) Source(15, 54) + SourceIndex(3) -7 >Emitted(61, 92) Source(15, 56) + SourceIndex(3) +7 >Emitted(61, 99) Source(15, 56) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1350,7 +1350,7 @@ sourceFile:../../third_part1.ts >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1588,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1588,"kind":"text"}]},{"pos":1588,"end":2156,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1588,"end":2156,"kind":"text"}]},{"pos":2156,"end":2309,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1614,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1614,"kind":"text"}]},{"pos":1614,"end":2189,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1614,"end":2189,"kind":"text"}]},{"pos":2189,"end":2342,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -1387,9 +1387,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1398,9 +1398,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -prepend: (1344-1588):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1614):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1588) +text: (1370-1614) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -1413,9 +1413,9 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1588-2156):: ../../../2/second-output.js texts:: 1 +prepend: (1614-2189):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1588-2156) +text: (1614-2189) var N; (function (N) { function f() { @@ -1430,7 +1430,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -1441,7 +1441,7 @@ var C = (function () { }()); ---------------------------------------------------------------------- -text: (2156-2309) +text: (2189-2342) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -1509,39 +1509,39 @@ declare function forthirdthird_part1Rest(): void; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1588, + "pos": 1370, + "end": 1614, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1588, + "pos": 1370, + "end": 1614, "kind": "text" } ] }, { - "pos": 1588, - "end": 2156, + "pos": 1614, + "end": 2189, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1588, - "end": 2156, + "pos": 1614, + "end": 2189, "kind": "text" } ] }, { - "pos": 2156, - "end": 2309, + "pos": 2189, + "end": 2342, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index c7447cf44c4e6..84fdc37ba3d23 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -257,7 +257,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -279,11 +279,11 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); //# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.js.map] -{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== @@ -313,7 +313,7 @@ sourceFile:../first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -540,7 +540,7 @@ sourceFile:../first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -563,14 +563,14 @@ sourceFile:../first_part3.ts 9 >Emitted(39, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(39, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -585,12 +585,12 @@ sourceFile:../first_part3.ts 4 >Emitted(40, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(40, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(40, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(40, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(40, 95) Source(6, 52) + SourceIndex(2) --- >>>//# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1267,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1300,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/first/bin/first-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -614,9 +614,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -625,7 +625,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (842-1267) +text: (868-1300) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { } @@ -640,7 +640,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ====================================================================== ====================================================================== @@ -680,13 +680,13 @@ declare const firstfirst_part3_ar: number[]; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1267, + "pos": 868, + "end": 1300, "kind": "text" } ], @@ -1182,7 +1182,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1215,7 +1215,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); var N; (function (N) { function f() { @@ -1241,7 +1241,7 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -1254,11 +1254,11 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -1288,7 +1288,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1526,7 +1526,7 @@ sourceFile:../../../first/first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1549,14 +1549,14 @@ sourceFile:../../../first/first_part3.ts 9 >Emitted(50, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(50, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -1571,7 +1571,7 @@ sourceFile:../../../first/first_part3.ts 4 >Emitted(51, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(51, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(51, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(51, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(51, 95) Source(6, 52) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1990,7 +1990,7 @@ sourceFile:../../../second/second_part2.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -2013,14 +2013,14 @@ sourceFile:../../../second/second_part2.ts 9 >Emitted(76, 37) Source(8, 39) + SourceIndex(4) 10>Emitted(76, 38) Source(8, 40) + SourceIndex(4) --- ->>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +>>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part2Spread @@ -2035,7 +2035,7 @@ sourceFile:../../../second/second_part2.ts 4 >Emitted(77, 57) Source(9, 28) + SourceIndex(4) 5 >Emitted(77, 67) Source(9, 33) + SourceIndex(4) 6 >Emitted(77, 88) Source(9, 54) + SourceIndex(4) -7 >Emitted(77, 92) Source(9, 56) + SourceIndex(4) +7 >Emitted(77, 99) Source(9, 56) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -2261,7 +2261,7 @@ sourceFile:../../third_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -2284,14 +2284,14 @@ sourceFile:../../third_part1.ts 9 >Emitted(89, 35) Source(7, 37) + SourceIndex(5) 10>Emitted(89, 36) Source(7, 38) + SourceIndex(5) --- ->>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +>>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >thirdthird_part1Spread @@ -2306,12 +2306,12 @@ sourceFile:../../third_part1.ts 4 >Emitted(90, 55) Source(8, 26) + SourceIndex(5) 5 >Emitted(90, 65) Source(8, 31) + SourceIndex(5) 6 >Emitted(90, 84) Source(8, 50) + SourceIndex(5) -7 >Emitted(90, 88) Source(8, 52) + SourceIndex(5) +7 >Emitted(90, 95) Source(8, 52) + SourceIndex(5) --- >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":1769,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1769,"kind":"text"}]},{"pos":1769,"end":2456,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1769,"end":2456,"kind":"text"}]},{"pos":2456,"end":2884,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":1802,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1802,"kind":"text"}]},{"pos":1802,"end":2496,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1802,"end":2496,"kind":"text"}]},{"pos":2496,"end":2931,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -2335,9 +2335,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -2346,7 +2346,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -2359,9 +2359,9 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1344-1769):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1802):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1769) +text: (1370-1802) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { } @@ -2376,12 +2376,12 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ---------------------------------------------------------------------- -prepend: (1769-2456):: ../../../2/second-output.js texts:: 1 +prepend: (1802-2496):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1769-2456) +text: (1802-2496) var N; (function (N) { function f() { @@ -2407,10 +2407,10 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); ---------------------------------------------------------------------- -text: (2456-2884) +text: (2496-2931) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -2423,7 +2423,7 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); ====================================================================== ====================================================================== @@ -2485,45 +2485,45 @@ declare const thirdthird_part1_ar: number[]; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 1769, + "pos": 1370, + "end": 1802, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1769, + "pos": 1370, + "end": 1802, "kind": "text" } ] }, { - "pos": 1769, - "end": 2456, + "pos": 1802, + "end": 2496, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1769, - "end": 2456, + "pos": 1802, + "end": 2496, "kind": "text" } ] }, { - "pos": 2456, - "end": 2884, + "pos": 2496, + "end": 2931, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js index 9f6f599385ed8..77536946eb10a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js @@ -778,7 +778,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -818,7 +818,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -835,7 +835,7 @@ function forthirdthird_part1Rest() { //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB,KAAK,CAAC;ACXtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -865,7 +865,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1243,7 +1243,7 @@ sourceFile:../../../second/second_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1266,14 +1266,14 @@ sourceFile:../../../second/second_part1.ts 9 >Emitted(57, 37) Source(14, 39) + SourceIndex(3) 10>Emitted(57, 38) Source(14, 40) + SourceIndex(3) --- ->>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +>>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part1Spread @@ -1288,7 +1288,7 @@ sourceFile:../../../second/second_part1.ts 4 >Emitted(58, 57) Source(15, 28) + SourceIndex(3) 5 >Emitted(58, 67) Source(15, 33) + SourceIndex(3) 6 >Emitted(58, 88) Source(15, 54) + SourceIndex(3) -7 >Emitted(58, 92) Source(15, 56) + SourceIndex(3) +7 >Emitted(58, 99) Source(15, 56) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1553,7 +1553,7 @@ sourceFile:../../third_part1.ts >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1342,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1344,"end":1494,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1494,"kind":"text"}]},{"pos":1494,"end":2062,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1494,"end":2062,"kind":"text"}]},{"pos":2062,"end":2215,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1368,"kind":"emitHelpers","data":"typescript:rest"},{"pos":1370,"end":1520,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1520,"kind":"text"}]},{"pos":1520,"end":2095,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1520,"end":2095,"kind":"text"}]},{"pos":2095,"end":2248,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -1577,9 +1577,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1588,7 +1588,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -emitHelpers: (842-1342):: typescript:rest +emitHelpers: (868-1368):: typescript:rest var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -1601,9 +1601,9 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1344-1494):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1520):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1494) +text: (1370-1520) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { } @@ -1613,9 +1613,9 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1494-2062):: ../../../2/second-output.js texts:: 1 +prepend: (1520-2095):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1494-2062) +text: (1520-2095) var N; (function (N) { function f() { @@ -1630,7 +1630,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -1641,7 +1641,7 @@ var C = (function () { }()); ---------------------------------------------------------------------- -text: (2062-2215) +text: (2095-2248) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -1703,45 +1703,45 @@ declare function forthirdthird_part1Rest(): void; }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1342, + "pos": 868, + "end": 1368, "kind": "emitHelpers", "data": "typescript:rest" }, { - "pos": 1344, - "end": 1494, + "pos": 1370, + "end": 1520, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1494, + "pos": 1370, + "end": 1520, "kind": "text" } ] }, { - "pos": 1494, - "end": 2062, + "pos": 1520, + "end": 2095, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1494, - "end": 2062, + "pos": 1520, + "end": 2095, "kind": "text" } ] }, { - "pos": 2062, - "end": 2215, + "pos": 2095, + "end": 2248, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js index 3f996472d29f7..5fea25f884c98 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js @@ -380,7 +380,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -413,11 +413,11 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); //# sourceMappingURL=second-output.js.map //// [/src/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE"} //// [/src/2/second-output.js.map.baseline.txt] =================================================================== @@ -458,7 +458,7 @@ sourceFile:../second/second_part1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -879,7 +879,7 @@ sourceFile:../second/second_part2.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -902,14 +902,14 @@ sourceFile:../second/second_part2.ts 9 >Emitted(61, 37) Source(8, 39) + SourceIndex(1) 10>Emitted(61, 38) Source(8, 40) + SourceIndex(1) --- ->>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +>>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part2Spread @@ -924,12 +924,12 @@ sourceFile:../second/second_part2.ts 4 >Emitted(62, 57) Source(9, 28) + SourceIndex(1) 5 >Emitted(62, 67) Source(9, 33) + SourceIndex(1) 6 >Emitted(62, 88) Source(9, 54) + SourceIndex(1) -7 >Emitted(62, 92) Source(9, 56) + SourceIndex(1) +7 >Emitted(62, 99) Source(9, 56) + SourceIndex(1) --- >>>//# sourceMappingURL=second-output.js.map //// [/src/2/second-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":2031,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":267,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":2064,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":267,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/2/second-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -966,9 +966,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -977,7 +977,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (1344-2031) +text: (1370-2064) var N; (function (N) { function f() { @@ -1003,7 +1003,7 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); ====================================================================== ====================================================================== @@ -1047,13 +1047,13 @@ declare const secondsecond_part2_ar: number[]; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 2031, + "pos": 1370, + "end": 2064, "kind": "text" } ], @@ -1325,7 +1325,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1349,11 +1349,11 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); //# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.js.map] -{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"first-output.js","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== @@ -1394,7 +1394,7 @@ sourceFile:../first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -1704,7 +1704,7 @@ sourceFile:../first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -1727,14 +1727,14 @@ sourceFile:../first_part3.ts 9 >Emitted(52, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(52, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -1749,12 +1749,12 @@ sourceFile:../first_part3.ts 4 >Emitted(53, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(53, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(53, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(53, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(53, 95) Source(6, 52) + SourceIndex(2) --- >>>//# sourceMappingURL=first-output.js.map //// [/src/first/bin/first-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1846,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"..","sourceFiles":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1879,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/first/bin/first-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -1791,9 +1791,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1802,7 +1802,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (1344-1846) +text: (1370-1879) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -1819,7 +1819,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ====================================================================== ====================================================================== @@ -1865,13 +1865,13 @@ declare const firstfirst_part3_ar: number[]; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1846, + "pos": 1370, + "end": 1879, "kind": "text" } ], @@ -2409,7 +2409,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -2433,7 +2433,7 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); var N; (function (N) { function f() { @@ -2459,7 +2459,7 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -2472,11 +2472,11 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,IAAE"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE;ACDnD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AACD,SAAS,yBAAyB;IAClC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACRvD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;AACD,SAAS,sBAAsB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACnD,IAAM,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,sBAAsB,8BAAC,EAAE,UAAK,mBAAmB,WAAE"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -2517,7 +2517,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -2827,7 +2827,7 @@ sourceFile:../../../first/first_part3.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -2850,14 +2850,14 @@ sourceFile:../../../first/first_part3.ts 9 >Emitted(52, 35) Source(5, 37) + SourceIndex(2) 10>Emitted(52, 36) Source(5, 38) + SourceIndex(2) --- ->>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +>>>firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >firstfirst_part3Spread @@ -2872,7 +2872,7 @@ sourceFile:../../../first/first_part3.ts 4 >Emitted(53, 55) Source(6, 26) + SourceIndex(2) 5 >Emitted(53, 65) Source(6, 31) + SourceIndex(2) 6 >Emitted(53, 84) Source(6, 50) + SourceIndex(2) -7 >Emitted(53, 88) Source(6, 52) + SourceIndex(2) +7 >Emitted(53, 95) Source(6, 52) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -3291,7 +3291,7 @@ sourceFile:../../../second/second_part2.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -3314,14 +3314,14 @@ sourceFile:../../../second/second_part2.ts 9 >Emitted(78, 37) Source(8, 39) + SourceIndex(4) 10>Emitted(78, 38) Source(8, 40) + SourceIndex(4) --- ->>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +>>>secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part2Spread @@ -3336,7 +3336,7 @@ sourceFile:../../../second/second_part2.ts 4 >Emitted(79, 57) Source(9, 28) + SourceIndex(4) 5 >Emitted(79, 67) Source(9, 33) + SourceIndex(4) 6 >Emitted(79, 88) Source(9, 54) + SourceIndex(4) -7 >Emitted(79, 92) Source(9, 56) + SourceIndex(4) +7 >Emitted(79, 99) Source(9, 56) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -3562,7 +3562,7 @@ sourceFile:../../third_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -3585,14 +3585,14 @@ sourceFile:../../third_part1.ts 9 >Emitted(91, 35) Source(7, 37) + SourceIndex(5) 10>Emitted(91, 36) Source(7, 38) + SourceIndex(5) --- ->>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +>>>thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >thirdthird_part1Spread @@ -3607,12 +3607,12 @@ sourceFile:../../third_part1.ts 4 >Emitted(92, 55) Source(8, 26) + SourceIndex(5) 5 >Emitted(92, 65) Source(8, 31) + SourceIndex(5) 6 >Emitted(92, 84) Source(8, 50) + SourceIndex(5) -7 >Emitted(92, 88) Source(8, 52) + SourceIndex(5) +7 >Emitted(92, 95) Source(8, 52) + SourceIndex(5) --- >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1846,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1846,"kind":"text"}]},{"pos":1846,"end":2533,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1846,"end":2533,"kind":"text"}]},{"pos":2533,"end":2961,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1879,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1879,"kind":"text"}]},{"pos":1879,"end":2573,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1879,"end":2573,"kind":"text"}]},{"pos":2573,"end":3008,"kind":"text"}],"sources":{"helpers":["typescript:rest","typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":318,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":318,"kind":"text"}]},{"pos":318,"end":585,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":318,"end":585,"kind":"text"}]},{"pos":585,"end":765,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -3649,9 +3649,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -3660,9 +3660,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -prepend: (1344-1846):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1879):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1846) +text: (1370-1879) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -3679,12 +3679,12 @@ function firstfirst_part3Spread() { } } var firstfirst_part3_ar = [20, 30]; -firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar))); +firstfirst_part3Spread.apply(void 0, __spreadArray([10], __read(firstfirst_part3_ar), false)); ---------------------------------------------------------------------- -prepend: (1846-2533):: ../../../2/second-output.js texts:: 1 +prepend: (1879-2573):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1846-2533) +text: (1879-2573) var N; (function (N) { function f() { @@ -3710,10 +3710,10 @@ function secondsecond_part2Spread() { } } var secondsecond_part2_ar = [20, 30]; -secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar))); +secondsecond_part2Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part2_ar), false)); ---------------------------------------------------------------------- -text: (2533-2961) +text: (2573-3008) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -3726,7 +3726,7 @@ function thirdthird_part1Spread() { } } var thirdthird_part1_ar = [20, 30]; -thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar))); +thirdthird_part1Spread.apply(void 0, __spreadArray([10], __read(thirdthird_part1_ar), false)); ====================================================================== ====================================================================== @@ -3794,39 +3794,39 @@ declare const thirdthird_part1_ar: number[]; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1846, + "pos": 1370, + "end": 1879, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1846, + "pos": 1370, + "end": 1879, "kind": "text" } ] }, { - "pos": 1846, - "end": 2533, + "pos": 1879, + "end": 2573, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1846, - "end": 2533, + "pos": 1879, + "end": 2573, "kind": "text" } ] }, { - "pos": 2533, - "end": 2961, + "pos": 2573, + "end": 3008, "kind": "text" } ], diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js index 10444bf1bb329..abb38f829225c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js @@ -341,7 +341,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -363,7 +363,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -375,7 +375,7 @@ var C = (function () { //# sourceMappingURL=second-output.js.map //// [/src/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/src/2/second-output.js.map.baseline.txt] =================================================================== @@ -405,7 +405,7 @@ sourceFile:../second/second_part1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -619,7 +619,7 @@ sourceFile:../second/second_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -642,14 +642,14 @@ sourceFile:../second/second_part1.ts 9 >Emitted(39, 37) Source(14, 39) + SourceIndex(0) 10>Emitted(39, 38) Source(14, 40) + SourceIndex(0) --- ->>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +>>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part1Spread @@ -664,7 +664,7 @@ sourceFile:../second/second_part1.ts 4 >Emitted(40, 57) Source(15, 28) + SourceIndex(0) 5 >Emitted(40, 67) Source(15, 33) + SourceIndex(0) 6 >Emitted(40, 88) Source(15, 54) + SourceIndex(0) -7 >Emitted(40, 92) Source(15, 56) + SourceIndex(0) +7 >Emitted(40, 99) Source(15, 56) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.js @@ -775,7 +775,7 @@ sourceFile:../second/second_part2.ts >>>//# sourceMappingURL=second-output.js.map //// [/src/2/second-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":840,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":842,"end":1410,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":214,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../second","sourceFiles":["../second/second_part1.ts","../second/second_part2.ts"],"js":{"sections":[{"pos":0,"end":504,"kind":"emitHelpers","data":"typescript:read"},{"pos":506,"end":866,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":868,"end":1443,"kind":"text"}],"sources":{"helpers":["typescript:read","typescript:spreadArray"]}},"dts":{"sections":[{"pos":0,"end":214,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/2/second-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -799,9 +799,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (506-840):: typescript:spreadArray +emitHelpers: (506-866):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -810,7 +810,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -text: (842-1410) +text: (868-1443) var N; (function (N) { function f() { @@ -825,7 +825,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -870,13 +870,13 @@ declare class C { }, { "pos": 506, - "end": 840, + "end": 866, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 842, - "end": 1410, + "pos": 868, + "end": 1443, "kind": "text" } ], @@ -1824,7 +1824,7 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -1855,7 +1855,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -1872,7 +1872,7 @@ function forthirdthird_part1Rest() { //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,IAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACf,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC;ACbD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AAED,SAAS,wBAAwB;IAAC,WAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,sBAAc;;AAAI,CAAC;AACrD,IAAM,qBAAqB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvC,wBAAwB,8BAAC,EAAE,UAAK,qBAAqB,WAAE;ACdvD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;ACJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC;AAChB,SAAS,uBAAuB;IAChC,IAAM,KAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAvC,CAAC,OAAA,EAAK,IAAI,cAAZ,KAAc,CAA2B,CAAC;AAChD,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== @@ -1913,7 +1913,7 @@ sourceFile:../../../first/first_PART1.ts >>> return ar; >>>}; >>>var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { ->>> if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { +>>> if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { >>> if (ar || !(i in from)) { >>> if (!ar) ar = Array.prototype.slice.call(from, 0, i); >>> ar[i] = from[i]; @@ -2363,7 +2363,7 @@ sourceFile:../../../second/second_part1.ts 8 > ^^ 9 > ^ 10> ^ -11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >const @@ -2386,14 +2386,14 @@ sourceFile:../../../second/second_part1.ts 9 >Emitted(59, 37) Source(14, 39) + SourceIndex(3) 10>Emitted(59, 38) Source(14, 40) + SourceIndex(3) --- ->>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +>>>secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 4 > ^^ 5 > ^^^^^^^^^^ 6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^ +7 > ^^^^^^^^^^^ 1-> > 2 >secondsecond_part1Spread @@ -2408,7 +2408,7 @@ sourceFile:../../../second/second_part1.ts 4 >Emitted(60, 57) Source(15, 28) + SourceIndex(3) 5 >Emitted(60, 67) Source(15, 33) + SourceIndex(3) 6 >Emitted(60, 88) Source(15, 54) + SourceIndex(3) -7 >Emitted(60, 92) Source(15, 56) + SourceIndex(3) +7 >Emitted(60, 99) Source(15, 56) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -2673,7 +2673,7 @@ sourceFile:../../third_part1.ts >>>//# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1342,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1344,"end":1571,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1344,"end":1571,"kind":"text"}]},{"pos":1571,"end":2139,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1571,"end":2139,"kind":"text"}]},{"pos":2139,"end":2292,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"../..","sourceFiles":["../../third_part1.ts"],"js":{"sections":[{"pos":0,"end":500,"kind":"emitHelpers","data":"typescript:rest"},{"pos":502,"end":1006,"kind":"emitHelpers","data":"typescript:read"},{"pos":1008,"end":1368,"kind":"emitHelpers","data":"typescript:spreadArray"},{"pos":1370,"end":1597,"kind":"prepend","data":"../../../first/bin/first-output.js","texts":[{"pos":1370,"end":1597,"kind":"text"}]},{"pos":1597,"end":2172,"kind":"prepend","data":"../../../2/second-output.js","texts":[{"pos":1597,"end":2172,"kind":"text"}]},{"pos":2172,"end":2325,"kind":"text"}],"sources":{"helpers":["typescript:rest"]}},"dts":{"sections":[{"pos":0,"end":208,"kind":"prepend","data":"../../../first/bin/first-output.d.ts","texts":[{"pos":0,"end":208,"kind":"text"}]},{"pos":208,"end":422,"kind":"prepend","data":"../../../2/second-output.d.ts","texts":[{"pos":208,"end":422,"kind":"text"}]},{"pos":422,"end":492,"kind":"text"}]}},"version":"FakeTSVersion"} //// [/src/third/thirdjs/output/third-output.tsbuildinfo.baseline.txt] ====================================================================== @@ -2710,9 +2710,9 @@ var __read = (this && this.__read) || function (o, n) { return ar; }; ---------------------------------------------------------------------- -emitHelpers: (1008-1342):: typescript:spreadArray +emitHelpers: (1008-1368):: typescript:spreadArray var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -2721,9 +2721,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { return to.concat(ar || from); }; ---------------------------------------------------------------------- -prepend: (1344-1571):: ../../../first/bin/first-output.js texts:: 1 +prepend: (1370-1597):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1344-1571) +text: (1370-1597) var s = "Hello, world"; console.log(s); function forfirstfirst_PART1Rest() { @@ -2735,9 +2735,9 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1571-2139):: ../../../2/second-output.js texts:: 1 +prepend: (1597-2172):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- -text: (1571-2139) +text: (1597-2172) var N; (function (N) { function f() { @@ -2752,7 +2752,7 @@ function secondsecond_part1Spread() { } } var secondsecond_part1_ar = [20, 30]; -secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar))); +secondsecond_part1Spread.apply(void 0, __spreadArray([10], __read(secondsecond_part1_ar), false)); var C = (function () { function C() { } @@ -2763,7 +2763,7 @@ var C = (function () { }()); ---------------------------------------------------------------------- -text: (2139-2292) +text: (2172-2325) var c = new C(); c.doSomething(); function forthirdthird_part1Rest() { @@ -2831,39 +2831,39 @@ declare function forthirdthird_part1Rest(): void; }, { "pos": 1008, - "end": 1342, + "end": 1368, "kind": "emitHelpers", "data": "typescript:spreadArray" }, { - "pos": 1344, - "end": 1571, + "pos": 1370, + "end": 1597, "kind": "prepend", "data": "../../../first/bin/first-output.js", "texts": [ { - "pos": 1344, - "end": 1571, + "pos": 1370, + "end": 1597, "kind": "text" } ] }, { - "pos": 1571, - "end": 2139, + "pos": 1597, + "end": 2172, "kind": "prepend", "data": "../../../2/second-output.js", "texts": [ { - "pos": 1571, - "end": 2139, + "pos": 1597, + "end": 2172, "kind": "text" } ] }, { - "pos": 2139, - "end": 2292, + "pos": 2172, + "end": 2325, "kind": "text" } ], diff --git a/tests/baselines/reference/tsxEmit1.js b/tests/baselines/reference/tsxEmit1.js index 696b20091511c..453f9e3b6f1f8 100644 --- a/tests/baselines/reference/tsxEmit1.js +++ b/tests/baselines/reference/tsxEmit1.js @@ -42,7 +42,7 @@ var whitespace3 =
//// [file.jsx] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -69,10 +69,10 @@ var SomeClass = /** @class */ (function () { SomeClass.prototype.f = function () { var _this = this; var rewrites1 =
{function () { return _this; }}
; - var rewrites2 =
{__spreadArray(__spreadArray([p], p, true), [p])}
; + var rewrites2 =
{__spreadArray(__spreadArray([p], p, true), [p], false)}
; var rewrites3 =
{{ p: p }}
; var rewrites4 =
; - var rewrites5 =
; + var rewrites5 =
; var rewrites6 =
; }; return SomeClass; diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js index 0293de779b081..4ea7eba0aea15 100644 --- a/tests/baselines/reference/tsxReactEmit1.js +++ b/tests/baselines/reference/tsxReactEmit1.js @@ -43,7 +43,7 @@ var whitespace3 =
//// [file.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -70,10 +70,10 @@ var SomeClass = /** @class */ (function () { SomeClass.prototype.f = function () { var _this = this; var rewrites1 = React.createElement("div", null, function () { return _this; }); - var rewrites2 = React.createElement("div", null, __spreadArray(__spreadArray([p], p, true), [p])); + var rewrites2 = React.createElement("div", null, __spreadArray(__spreadArray([p], p, true), [p], false)); var rewrites3 = React.createElement("div", null, { p: p }); var rewrites4 = React.createElement("div", { a: function () { return _this; } }); - var rewrites5 = React.createElement("div", { a: __spreadArray(__spreadArray([p], p, true), [p]) }); + var rewrites5 = React.createElement("div", { a: __spreadArray(__spreadArray([p], p, true), [p], false) }); var rewrites6 = React.createElement("div", { a: { p: p } }); }; return SomeClass; diff --git a/tests/baselines/reference/typedArrays-es5.js b/tests/baselines/reference/typedArrays-es5.js index 64f4b05f7e32f..5d602fdfec94d 100644 --- a/tests/baselines/reference/typedArrays-es5.js +++ b/tests/baselines/reference/typedArrays-es5.js @@ -34,7 +34,7 @@ const uint8ClampedArray = new Uint8ClampedArray(1); //// [typedArrays-es5.js] var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; diff --git a/tests/baselines/reference/variadicTuples1.js b/tests/baselines/reference/variadicTuples1.js index 0f3b93989757d..8445b207a11c8 100644 --- a/tests/baselines/reference/variadicTuples1.js +++ b/tests/baselines/reference/variadicTuples1.js @@ -406,7 +406,7 @@ type U3 = [...[string, number], boolean]; "use strict"; // Variadics in tuple types var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -416,7 +416,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { }; // Variadics in array literals function tup2(t, u) { - return __spreadArray(__spreadArray(__spreadArray(__spreadArray([1], t, true), [2]), u, true), [3]); + return __spreadArray(__spreadArray(__spreadArray(__spreadArray([1], t, true), [2], false), u, true), [3], false); } var t2 = tup2(['hello'], [10, true]); function concat(t, u) { @@ -432,16 +432,16 @@ function concat2(t, u) { var tc5 = concat2([1, 2, 3], [4, 5, 6]); // (1 | 2 | 3 | 4 | 5 | 6)[] function foo2(t1, t2, a1) { foo1(1, 'abc', true, 42, 43, 44); - foo1.apply(void 0, __spreadArray(__spreadArray([], t1), [true, 42, 43, 44])); - foo1.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], t1), t2), [42, 43, 44])); - foo1.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], t1), t2), a1)); + foo1.apply(void 0, __spreadArray(__spreadArray([], t1, false), [true, 42, 43, 44], false)); + foo1.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], t1, false), t2, false), [42, 43, 44], false)); + foo1.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], t1, false), t2, false), a1, false)); foo1.apply(void 0, t1); // Error - foo1.apply(void 0, __spreadArray(__spreadArray([], t1), [45])); // Error + foo1.apply(void 0, __spreadArray(__spreadArray([], t1, false), [45], false)); // Error } function foo4(u) { foo3(1, 2); foo3(1, 'hello', true, 2); - foo3.apply(void 0, __spreadArray(__spreadArray([1], u), ['hi', 2])); + foo3.apply(void 0, __spreadArray(__spreadArray([1], u, false), ['hi', 2], false)); foo3(1); } ft1(['hello', 42]); // (string | number)[] @@ -475,17 +475,17 @@ function f3(t) { var tm1 = fm1([['abc'], [42], [true], ['def']]); // [boolean, string] function gx1(u, v) { fx1('abc'); // [] - fx1.apply(void 0, __spreadArray(['abc'], u)); // U - fx1.apply(void 0, __spreadArray(['abc'], v)); // [...V] - fx1.apply(void 0, __spreadArray(['abc'], u)); // U - fx1.apply(void 0, __spreadArray(['abc'], v)); // Error + fx1.apply(void 0, __spreadArray(['abc'], u, false)); // U + fx1.apply(void 0, __spreadArray(['abc'], v, false)); // [...V] + fx1.apply(void 0, __spreadArray(['abc'], u, false)); // U + fx1.apply(void 0, __spreadArray(['abc'], v, false)); // Error } function gx2(u, v) { fx2('abc'); // [] - fx2.apply(void 0, __spreadArray(['abc'], u)); // U - fx2.apply(void 0, __spreadArray(['abc'], v)); // [...V] - fx2.apply(void 0, __spreadArray(['abc'], u)); // U - fx2.apply(void 0, __spreadArray(['abc'], v)); // V + fx2.apply(void 0, __spreadArray(['abc'], u, false)); // U + fx2.apply(void 0, __spreadArray(['abc'], v, false)); // [...V] + fx2.apply(void 0, __spreadArray(['abc'], u, false)); // U + fx2.apply(void 0, __spreadArray(['abc'], v, false)); // V } // Relations involving variadic tuple types function f10(x, y, z) { @@ -552,7 +552,7 @@ function curry(f) { for (var _i = 0; _i < arguments.length; _i++) { b[_i] = arguments[_i]; } - return f.apply(void 0, __spreadArray(__spreadArray([], a), b)); + return f.apply(void 0, __spreadArray(__spreadArray([], a, false), b, false)); }; } var fn1 = function (a, b, c, d) { return 0; }; @@ -581,10 +581,10 @@ var fn3 = function () { }; var c20 = curry(fn3); // (...args: string[]) => number var c21 = curry(fn3, 'abc', 'def'); // (...args: string[]) => number -var c22 = curry.apply(void 0, __spreadArray([fn3], sa)); // (...args: string[]) => number +var c22 = curry.apply(void 0, __spreadArray([fn3], sa, false)); // (...args: string[]) => number // No inference to [...T, ...U] when there is no implied arity function curry2(f, t, u) { - return f.apply(void 0, __spreadArray(__spreadArray([], t), u)); + return f.apply(void 0, __spreadArray(__spreadArray([], t, false), u, false)); } curry2(fn10, ['hello', 42], [true]); curry2(fn10, ['hello'], [42, true]); @@ -593,13 +593,13 @@ ft([1, 2], [1, 2, 3]); ft(['a', 'b'], ['c', 'd']); ft(['a', 'b'], ['c', 'd', 42]); call('hello', 32, function (a, b) { return 42; }); -call.apply(void 0, __spreadArray(__spreadArray([], sa), [function () { +call.apply(void 0, __spreadArray(__spreadArray([], sa, false), [function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { x[_i] = arguments[_i]; } return 42; - }])); + }], false)); function f21(args) { var v1 = f20(args); // U var v2 = f20(["foo", "bar"]); // [string] @@ -617,7 +617,7 @@ function callApi(method) { for (var _i = 0; _i < arguments.length; _i++) { args[_i] = arguments[_i]; } - return method.apply(void 0, __spreadArray(__spreadArray([], args), [{}])); + return method.apply(void 0, __spreadArray(__spreadArray([], args, false), [{}], false)); }; } callApi(getUser); diff --git a/tests/baselines/reference/variadicTuples2.js b/tests/baselines/reference/variadicTuples2.js index 8b625e4e233ef..d413b8fc06f25 100644 --- a/tests/baselines/reference/variadicTuples2.js +++ b/tests/baselines/reference/variadicTuples2.js @@ -135,7 +135,7 @@ const e1 = foo('blah1', 'blah2', 1, 2, 3); // Error "use strict"; // Declarations var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { - if (pack) for (var i = 0, l = from.length, ar; i < l; i++) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { if (ar || !(i in from)) { if (!ar) ar = Array.prototype.slice.call(from, 0, i); ar[i] = from[i]; @@ -195,14 +195,14 @@ pipe("foo", 123, true, function () { } x; // [string, number, boolean] }); -pipe.apply(void 0, __spreadArray(__spreadArray([], sa), [function () { +pipe.apply(void 0, __spreadArray(__spreadArray([], sa, false), [function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { x[_i] = arguments[_i]; } x; // string[] - }])); -pipe.apply(void 0, __spreadArray(__spreadArray([1], sa), [2, function () { + }], false)); +pipe.apply(void 0, __spreadArray(__spreadArray([1], sa, false), [2, function () { var x = []; for (var _i = 0; _i < arguments.length; _i++) { x[_i] = arguments[_i]; @@ -210,7 +210,7 @@ pipe.apply(void 0, __spreadArray(__spreadArray([1], sa), [2, function () { x; // [number, ...string[], number] var qq = x[x.length - 1]; var ww = x[0]; - }])); + }], false)); pipe(1, 2, 3, 4); // Error pipe.apply(void 0, sa); // Error fn1([]); // Error