fix: allow spreading of strings within arrays (microsoft#175)

jcfranco · May 16, 2022 · 5287704 · 5287704
1 parent 5bfaf87
commit 5287704
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/tslib.es6.js b/tslib.es6.js
@@ -167,10 +167,15 @@ export function __spreadArrays() {
 }
 
 export function __spreadArray(to, from, pack) {
-    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];
+    if (pack || arguments.length === 2) {
+        if (typeof from === "string") from = Array.prototype.slice.call(from);
+        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];
+            }
         }
     }
     return to.concat(ar || Array.prototype.slice.call(from));

diff --git a/tslib.js b/tslib.js
@@ -209,10 +209,15 @@ var __createBinding;
     };
 
     __spreadArray = function (to, from, pack) {
-        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];
+        if (pack || arguments.length === 2) {
+            if (typeof from === "string") from = Array.prototype.slice.call(from);
+            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];
+                }
             }
         }
         return to.concat(ar || Array.prototype.slice.call(from));