2.2.1 (#4885)

* 2.2.1 changelog

* Bump version to 2.2.1 and update output

Author: GeoffreyBooth

docs/v2/annotated-source/nodes.html

@@ -2947,7 +2947,11 @@ <h3 id="range">Range</h3>
     idx      = del o, <span class="hljs-string">'index'</span>
     idxName  = del o, <span class="hljs-string">'name'</span>
     namedIndex = idxName <span class="hljs-keyword">and</span> idxName <span class="hljs-keyword">isnt</span> idx
-    varPart  = <span class="hljs-string">"<span class="hljs-subst">#{idx}</span> = <span class="hljs-subst">#{@fromC}</span>"</span>
+    varPart  =
+      <span class="hljs-keyword">if</span> known <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> namedIndex
+        <span class="hljs-string">"var <span class="hljs-subst">#{idx}</span> = <span class="hljs-subst">#{@fromC}</span>"</span>
+      <span class="hljs-keyword">else</span>
+        <span class="hljs-string">"<span class="hljs-subst">#{idx}</span> = <span class="hljs-subst">#{@fromC}</span>"</span>
     varPart += <span class="hljs-string">", <span class="hljs-subst">#{@toC}</span>"</span> <span class="hljs-keyword">if</span> @toC <span class="hljs-keyword">isnt</span> @toVar
     varPart += <span class="hljs-string">", <span class="hljs-subst">#{@step}</span>"</span> <span class="hljs-keyword">if</span> @step <span class="hljs-keyword">isnt</span> @stepVar
     [lt, gt] = [<span class="hljs-string">"<span class="hljs-subst">#{idx}</span> &lt;<span class="hljs-subst">#{@equals}</span>"</span>, <span class="hljs-string">"<span class="hljs-subst">#{idx}</span> &gt;<span class="hljs-subst">#{@equals}</span>"</span>]</pre></div></div>
@@ -4955,8 +4959,8 @@ <h3 id="assign">Assign</h3>
 
             <div class="content"><div class='highlight'><pre>      objects[splatsAndExpans.sort()[<span class="hljs-number">1</span>]].error <span class="hljs-string">"multiple splats/expansions are disallowed in an assignment"</span>
 
-    isSplat = splats.length
-    isExpans = expans.length
+    isSplat = splats?.length &gt; <span class="hljs-number">0</span>
+    isExpans = expans?.length &gt; <span class="hljs-number">0</span>
     isObject = @variable.isObject()
     isArray = @variable.isArray()
 
@@ -5101,7 +5105,7 @@ <h3 id="assign">Assign</h3>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-function">    <span class="hljs-title">loopObjects</span> = <span class="hljs-params">(objs, vvarTxt)</span> =&gt;</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">    <span class="hljs-title">loopObjects</span> = <span class="hljs-params">(objs, vvar, vvarTxt)</span> =&gt;</span>
       objSpreads = hasObjSpreads objs
       <span class="hljs-keyword">for</span> obj, i <span class="hljs-keyword">in</span> objs</pre></div></div>
 
@@ -5182,16 +5186,16 @@ <h3 id="assign">Assign</h3>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-function">    <span class="hljs-title">assignObjects</span> = <span class="hljs-params">(objs, vvarTxt)</span> =&gt;</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">    <span class="hljs-title">assignObjects</span> = <span class="hljs-params">(objs, vvar, vvarTxt)</span> =&gt;</span>
       vvar = <span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Arr(objs, <span class="hljs-literal">yes</span>)
       vval = <span class="hljs-keyword">if</span> vvarTxt <span class="hljs-keyword">instanceof</span> Value <span class="hljs-keyword">then</span> vvarTxt <span class="hljs-keyword">else</span> <span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal(vvarTxt)
       assigns.push <span class="hljs-keyword">new</span> Assign(vvar, vval, <span class="hljs-literal">null</span>, param: @param, subpattern: <span class="hljs-literal">yes</span>).compileToFragments o, LEVEL_LIST
 <span class="hljs-function">
-    <span class="hljs-title">processObjects</span> = <span class="hljs-params">(objs, vvarTxt)</span> -&gt;</span>
+    <span class="hljs-title">processObjects</span> = <span class="hljs-params">(objs, vvar, vvarTxt)</span> -&gt;</span>
       <span class="hljs-keyword">if</span> complexObjects objs
-        loopObjects objs, vvarTxt
+        loopObjects objs, vvar, vvarTxt
       <span class="hljs-keyword">else</span>
-        assignObjects objs, vvarTxt</pre></div></div>
+        assignObjects objs, vvar, vvarTxt</pre></div></div>
 
         </li>
 
@@ -5220,7 +5224,7 @@ <h3 id="assign">Assign</h3>
       expIdx = splatsAndExpans[<span class="hljs-number">0</span>]
       leftObjs = objects.slice <span class="hljs-number">0</span>, expIdx + (<span class="hljs-keyword">if</span> isSplat <span class="hljs-keyword">then</span> <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> <span class="hljs-number">0</span>)
       rightObjs = objects.slice expIdx + <span class="hljs-number">1</span>
-      processObjects leftObjs, vvarText <span class="hljs-keyword">if</span> leftObjs.length <span class="hljs-keyword">isnt</span> <span class="hljs-number">0</span>
+      processObjects leftObjs, vvar, vvarText <span class="hljs-keyword">if</span> leftObjs.length <span class="hljs-keyword">isnt</span> <span class="hljs-number">0</span>
       <span class="hljs-keyword">if</span> rightObjs.length <span class="hljs-keyword">isnt</span> <span class="hljs-number">0</span></pre></div></div>
 
         </li>
@@ -5243,7 +5247,7 @@ <h3 id="assign">Assign</h3>
           restVar = refExp
           refExp = o.scope.freeVariable <span class="hljs-string">'ref'</span>
           assigns.push [@makeCode(refExp + <span class="hljs-string">' = '</span>), restVar.compileToFragments(o, LEVEL_LIST)...]
-        processObjects rightObjs, refExp
+        processObjects rightObjs, vvar, refExp
     <span class="hljs-keyword">else</span></pre></div></div>
 
         </li>
@@ -5259,7 +5263,7 @@ <h3 id="assign">Assign</h3>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>      processObjects objects, vvarText
+            <div class="content"><div class='highlight'><pre>      processObjects objects, vvar, vvarText
     assigns.push vvar <span class="hljs-keyword">unless</span> top <span class="hljs-keyword">or</span> @subpattern
     fragments = @joinFragmentArrays assigns, <span class="hljs-string">', '</span>
     <span class="hljs-keyword">if</span> o.level &lt; LEVEL_LIST <span class="hljs-keyword">then</span> fragments <span class="hljs-keyword">else</span> @wrapInParentheses fragments</pre></div></div>

docs/v2/browser-compiler/coffeescript.js

@@ -646,7 +646,7 @@
       <section id="overview">
         <p><strong>CoffeeScript is a little language that compiles into JavaScript.</strong> Underneath that awkward Java-esque patina, JavaScript has always had a gorgeous heart. CoffeeScript is an attempt to expose the good parts of JavaScript in a simple way.</p>
 <p>The golden rule of CoffeeScript is: <em>“It’s just JavaScript.”</em> The code compiles one-to-one into the equivalent JS, and there is no interpretation at runtime. You can use any existing JavaScript library seamlessly from CoffeeScript (and vice-versa). The compiled output is readable, pretty-printed, and tends to run as fast or faster than the equivalent handwritten JavaScript.</p>
-<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/2.2.0">2.2.0</a></p>
+<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/2.2.1">2.2.1</a></p>
 <blockquote class="uneditable-code-block"><pre><code class="language-bash"><span class="comment"># Install locally for a project:</span>
 npm install --save-dev coffeescript
 
@@ -4790,7 +4790,7 @@ <h2>Web Chat (IRC)</h2>
         </section>
         <section id="annotated-source">
           <h2>Annotated Source</h2>
-<p>You can browse the CoffeeScript 2.2.0 source in readable, annotated form <a href="annotated-source/">here</a>. You can also jump directly to a particular source file:</p>
+<p>You can browse the CoffeeScript 2.2.1 source in readable, annotated form <a href="annotated-source/">here</a>. You can also jump directly to a particular source file:</p>
 <ul>
 <li><a href="annotated-source/grammar.html">Grammar Rules — src/grammar</a></li>
 <li><a href="annotated-source/lexer.html">Lexing Tokens — src/lexer</a></li>
@@ -5467,6 +5467,14 @@ <h3>Argument parsing and shebang (<code>#!</code>) lines</h3>
       </section>
       <section id="changelog">
         <h2>Changelog</h2>
+<div class="anchor" id="2.2.1"></div>
+<h2 class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/2.1.0...2.2.1">2.2.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2018-02-06">February 6, 2018</time></span>
+</h2><ul>
+<li>Bugfix for regression in 2.2.0 involving an error thrown by the compiler in certain cases when using destructuring with a splat or expansion in an array.</li>
+<li>Bugfix for regression in 2.2.0 where in certain cases a range iterator variable was declared in the global scope.</li>
+</ul>
 <div class="anchor" id="2.2.0"></div>
 <h2 class="header">
   <a href="https://github.com/jashkenas/coffeescript/compare/2.1.1...2.2.0">2.2.0</a>

docs/v2/index.html

@@ -1573,6 +1573,46 @@ <h1>CoffeeScript Test Suite</h1>
   {{g}...} = g: 1
   eq g, 1
 
+test "#4878: Compile error when using destructuring with a splat or expansion in an array", ->
+  arr = ['a', 'b', 'c', 'd']
+
+  f1 = (list) ->
+    [first, ..., last] = list
+
+  f2 = (list) ->
+    [first..., last] = list
+
+  f3 = (list) ->
+    ([first, ...] = list); first
+
+  f4 = (list) ->
+    ([first, ...rest] = list); rest
+
+  arrayEq f1(arr), arr
+  arrayEq f2(arr), arr
+  arrayEq f3(arr), 'a'
+  arrayEq f4(arr), ['b', 'c', 'd']
+
+  foo = (list) ->
+    ret =
+      if list?.length > 0
+        [first, ..., last] = list
+        [first, last]
+      else
+        []
+
+  arrayEq foo(arr), ['a', 'd']
+
+  bar = (list) ->
+    ret =
+      if list?.length > 0
+        [first, ...rest] = list
+        [first, rest]
+      else
+        []
+
+  arrayEq bar(arr), ['a', ['b', 'c', 'd']]
+
 </script>
 <script type="text/x-coffeescript" class="test" id="async">
 # Functions that contain the `await` keyword will compile into async functions,
@@ -16173,6 +16213,13 @@ <h2>Another heading</h2>
   r = (x for x in [b..a] by step)
   arrayEq r, []
 
+test "#4884: Range not declaring var for the 'i'", ->
+  'use strict'
+  [0..21].forEach (idx) ->
+    idx + 1
+
+  eq global.i, undefined
+
 </script>
 <script type="text/x-coffeescript" class="test" id="regexps">
 # Regular Expression Literals

docs/v2/test.html

@@ -1,5 +1,11 @@
 ## Changelog
 
+```
+releaseHeader('2018-02-06', '2.2.1', '2.1.0')
+```
+*   Bugfix for regression in 2.2.0 involving an error thrown by the compiler in certain cases when using destructuring with a splat or expansion in an array.
+*   Bugfix for regression in 2.2.0 where in certain cases a range iterator variable was declared in the global scope.
+
 ```
 releaseHeader('2018-02-01', '2.2.0', '2.1.1')
 ```