fix: upgrade coffee-lex and update tests (#241)

alangpierce · web-flow · commit 0695bb51f8e6 · 2017-07-08T15:03:32.000-07:00
This also required upgrading typescript to support string enums.

Also upgrade to latest decaffeinate-coffeescript.

BREAKING CHANGE: The token format included within chained comparison operators
now uses string enums.
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
     "@types/babylon": "^6.16.1",
     "@types/json-stable-stringify": "^1.0.31",
     "babylon": "^6.14.1",
-    "coffee-lex": "^7.0.0",
-    "decaffeinate-coffeescript": "1.10.0-patch25",
+    "coffee-lex": "^8.0.0",
+    "decaffeinate-coffeescript": "1.10.0-patch26",
     "json-stable-stringify": "^1.0.1",
     "lines-and-columns": "^1.1.6"
   },
@@ -48,9 +48,9 @@
     "mocha": "^3.0.0",
     "semantic-release": "^6.3.2",
     "string-repeat": "^1.1.1",
-    "ts-node": "^3.0.6",
-    "tslint": "^5.0.0",
-    "typescript": "^2.2.1"
+    "ts-node": "^3.2.0",
+    "tslint": "^5.5.0",
+    "typescript": "^2.4.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
diff --git a/test/examples/block-comment-in-function/output.json b/test/examples/block-comment-in-function/output.json
@@ -45,4 +45,4 @@
   ],
   "raw": "->\n  ###\n  a\n  ###\n",
   "type": "Program"
-}
+}
diff --git a/test/examples/chained-comparison-equals/output.json b/test/examples/chained-comparison-equals/output.json
@@ -53,15 +53,15 @@
             "token": {
               "end": 4,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "==",
             "token": {
               "end": 9,
               "start": 7,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-extended/output.json b/test/examples/chained-comparison-extended/output.json
@@ -75,31 +75,31 @@
             "token": {
               "end": 3,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 7,
               "start": 6,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 11,
               "start": 10,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 15,
               "start": 14,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-greater-than/output.json b/test/examples/chained-comparison-greater-than/output.json
@@ -53,15 +53,15 @@
             "token": {
               "end": 3,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": ">",
             "token": {
               "end": 7,
               "start": 6,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-less-than/output.json b/test/examples/chained-comparison-less-than/output.json
@@ -53,15 +53,15 @@
             "token": {
               "end": 3,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 7,
               "start": 6,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-mixed/output.json b/test/examples/chained-comparison-mixed/output.json
@@ -53,15 +53,15 @@
             "token": {
               "end": 3,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": ">",
             "token": {
               "end": 7,
               "start": 6,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-nested/output.json b/test/examples/chained-comparison-nested/output.json
@@ -57,15 +57,15 @@
                 "token": {
                   "end": 5,
                   "start": 3,
-                  "type": 39
+                  "type": "OPERATOR"
                 }
               },
               {
                 "operator": "==",
                 "token": {
                   "end": 10,
                   "start": 8,
-                  "type": 39
+                  "type": "OPERATOR"
                 }
               }
             ],
@@ -105,15 +105,15 @@
             "token": {
               "end": 16,
               "start": 14,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "==",
             "token": {
               "end": 21,
               "start": 19,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-not-equal/output.json b/test/examples/chained-comparison-not-equal/output.json
@@ -53,15 +53,15 @@
             "token": {
               "end": 4,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "!=",
             "token": {
               "end": 9,
               "start": 7,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-three/output.json b/test/examples/chained-comparison-three/output.json
@@ -64,23 +64,23 @@
             "token": {
               "end": 4,
               "start": 2,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "==",
             "token": {
               "end": 9,
               "start": 7,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "==",
             "token": {
               "end": 14,
               "start": 12,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-with-increment/output.json b/test/examples/chained-comparison-with-increment/output.json
@@ -63,15 +63,15 @@
             "token": {
               "end": 2,
               "start": 1,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 6,
               "start": 5,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-with-other-operators/output.json b/test/examples/chained-comparison-with-other-operators/output.json
@@ -158,15 +158,15 @@
             "token": {
               "end": 11,
               "start": 10,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 19,
               "start": 18,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/chained-comparison-with-unary-negate/output.json b/test/examples/chained-comparison-with-unary-negate/output.json
@@ -63,15 +63,15 @@
             "token": {
               "end": 4,
               "start": 3,
-              "type": 39
+              "type": "OPERATOR"
             }
           },
           {
             "operator": "<",
             "token": {
               "end": 8,
               "start": 7,
-              "type": 39
+              "type": "OPERATOR"
             }
           }
         ],
diff --git a/test/examples/for-comprehension/output.json b/test/examples/for-comprehension/output.json
@@ -79,4 +79,4 @@
   ],
   "raw": "a for b in c",
   "type": "Program"
-}
+}
diff --git a/test/examples/post-for/output.json b/test/examples/post-for/output.json
@@ -79,4 +79,4 @@
   ],
   "raw": "a for a in b\n",
   "type": "Program"
-}
+}
diff --git a/test/examples/while-on-one-line/output.json b/test/examples/while-on-one-line/output.json
@@ -67,4 +67,4 @@
   ],
   "raw": "a while b",
   "type": "Program"
-}
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -53,15 +53,15 @@`
`53`	`53`	`"token": {`
`54`	`54`	`"end": 4,`
`55`	`55`	`"start": 2,`
`56`		`- "type": 39`
	`56`	`+ "type": "OPERATOR"`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`"operator": "==",`
`61`	`61`	`"token": {`
`62`	`62`	`"end": 9,`
`63`	`63`	`"start": 7,`
`64`		`- "type": 39`
	`64`	`+ "type": "OPERATOR"`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`],`
Original file line number	Diff line number	Diff line change
`@@ -75,31 +75,31 @@`
`75`	`75`	`"token": {`
`76`	`76`	`"end": 3,`
`77`	`77`	`"start": 2,`
`78`		`- "type": 39`
	`78`	`+ "type": "OPERATOR"`
`79`	`79`	`}`
`80`	`80`	`},`
`81`	`81`	`{`
`82`	`82`	`"operator": "<",`
`83`	`83`	`"token": {`
`84`	`84`	`"end": 7,`
`85`	`85`	`"start": 6,`
`86`		`- "type": 39`
	`86`	`+ "type": "OPERATOR"`
`87`	`87`	`}`
`88`	`88`	`},`
`89`	`89`	`{`
`90`	`90`	`"operator": "<",`
`91`	`91`	`"token": {`
`92`	`92`	`"end": 11,`
`93`	`93`	`"start": 10,`
`94`		`- "type": 39`
	`94`	`+ "type": "OPERATOR"`
`95`	`95`	`}`
`96`	`96`	`},`
`97`	`97`	`{`
`98`	`98`	`"operator": "<",`
`99`	`99`	`"token": {`
`100`	`100`	`"end": 15,`
`101`	`101`	`"start": 14,`
`102`		`- "type": 39`
	`102`	`+ "type": "OPERATOR"`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`],`
Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,15 @@`
`57`	`57`	`"token": {`
`58`	`58`	`"end": 5,`
`59`	`59`	`"start": 3,`
`60`		`- "type": 39`
	`60`	`+ "type": "OPERATOR"`
`61`	`61`	`}`
`62`	`62`	`},`
`63`	`63`	`{`
`64`	`64`	`"operator": "==",`
`65`	`65`	`"token": {`
`66`	`66`	`"end": 10,`
`67`	`67`	`"start": 8,`
`68`		`- "type": 39`
	`68`	`+ "type": "OPERATOR"`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`],`
`@@ -105,15 +105,15 @@`
`105`	`105`	`"token": {`
`106`	`106`	`"end": 16,`
`107`	`107`	`"start": 14,`
`108`		`- "type": 39`
	`108`	`+ "type": "OPERATOR"`
`109`	`109`	`}`
`110`	`110`	`},`
`111`	`111`	`{`
`112`	`112`	`"operator": "==",`
`113`	`113`	`"token": {`
`114`	`114`	`"end": 21,`
`115`	`115`	`"start": 19,`
`116`		`- "type": 39`
	`116`	`+ "type": "OPERATOR"`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`],`
Original file line number	Diff line number	Diff line change
`@@ -64,23 +64,23 @@`
`64`	`64`	`"token": {`
`65`	`65`	`"end": 4,`
`66`	`66`	`"start": 2,`
`67`		`- "type": 39`
	`67`	`+ "type": "OPERATOR"`
`68`	`68`	`}`
`69`	`69`	`},`
`70`	`70`	`{`
`71`	`71`	`"operator": "==",`
`72`	`72`	`"token": {`
`73`	`73`	`"end": 9,`
`74`	`74`	`"start": 7,`
`75`		`- "type": 39`
	`75`	`+ "type": "OPERATOR"`
`76`	`76`	`}`
`77`	`77`	`},`
`78`	`78`	`{`
`79`	`79`	`"operator": "==",`
`80`	`80`	`"token": {`
`81`	`81`	`"end": 14,`
`82`	`82`	`"start": 12,`
`83`		`- "type": 39`
	`83`	`+ "type": "OPERATOR"`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`],`