Update: add kind property to varaibles

mysticatea · mysticatea · commit a03a90010a45 · 2017-05-01T13:59:41.000+09:00
diff --git a/docs/ast.md b/docs/ast.md
@@ -159,6 +159,7 @@ interface VElement <: Node {
 
 interface Variable {
     id: Identifier
+    kind: "v-for" | "scope"
 }
 ```
 
diff --git a/lib/transform-html.js b/lib/transform-html.js
@@ -79,7 +79,7 @@ function isVForVariable(leafNode) {
 function extractScopeVariables(references, variables) {
     while (references.length >= 1) {
         const reference = references.shift()
-        variables.push({id: reference.id})
+        variables.push({id: reference.id, kind: "scope"})
     }
 }
 
@@ -98,7 +98,7 @@ function extractVForVariables(references, variables) {
         if (isVForVariable(reference.id)) {
             references.splice(i, 1)
             if (reference.id !== prevId) {
-                variables.push({id: reference.id})
+                variables.push({id: reference.id, kind: "v-for"})
             }
         }
         else {
diff --git a/test/fixtures/template-ast/v-for-directives-with-destructuring.ast.json b/test/fixtures/template-ast/v-for-directives-with-destructuring.ast.json
@@ -471,7 +471,8 @@
                                 31
                             ],
                             "name": "key"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -493,7 +494,8 @@
                                 36
                             ],
                             "name": "name"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -829,7 +831,8 @@
                                 73
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -851,7 +854,8 @@
                                 76
                             ],
                             "name": "b"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -873,7 +877,8 @@
                                 80
                             ],
                             "name": "c"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -1188,7 +1193,8 @@
                                 116
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -1210,7 +1216,8 @@
                                 118
                             ],
                             "name": "b"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -1696,7 +1703,8 @@
                                 160
                             ],
                             "name": "key"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -1718,7 +1726,8 @@
                                 167
                             ],
                             "name": "name"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
diff --git a/test/fixtures/template-ast/v-for-directives.ast.json b/test/fixtures/template-ast/v-for-directives.ast.json
@@ -344,7 +344,8 @@
                                 28
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -658,7 +659,8 @@
                                 63
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -680,7 +682,8 @@
                                 66
                             ],
                             "name": "b"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -702,7 +705,8 @@
                                 69
                             ],
                             "name": "c"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -976,7 +980,8 @@
                                 104
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },
@@ -1290,7 +1295,8 @@
                                 139
                             ],
                             "name": "a"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -1312,7 +1318,8 @@
                                 142
                             ],
                             "name": "b"
-                        }
+                        },
+                        "kind": "v-for"
                     },
                     {
                         "id": {
@@ -1334,7 +1341,8 @@
                                 145
                             ],
                             "name": "c"
-                        }
+                        },
+                        "kind": "v-for"
                     }
                 ]
             },

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ interface VElement <: Node {`
`159`	`159`
`160`	`160`	`interface Variable {`
`161`	`161`	`id: Identifier`
	`162`	`+ kind: "v-for" \| "scope"`
`162`	`163`	`}`
`163`	`164`	```
`164`	`165`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function isVForVariable(leafNode) {`
`79`	`79`	`function extractScopeVariables(references, variables) {`
`80`	`80`	`while (references.length >= 1) {`
`81`	`81`	`const reference = references.shift()`
`82`		`- variables.push({id: reference.id})`
	`82`	`+ variables.push({id: reference.id, kind: "scope"})`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`@@ -98,7 +98,7 @@ function extractVForVariables(references, variables) {`
`98`	`98`	`if (isVForVariable(reference.id)) {`
`99`	`99`	`references.splice(i, 1)`
`100`	`100`	`if (reference.id !== prevId) {`
`101`		`- variables.push({id: reference.id})`
	`101`	`+ variables.push({id: reference.id, kind: "v-for"})`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,8 @@`
`471`	`471`	`31`
`472`	`472`	`],`
`473`	`473`	`"name": "key"`
`474`		`- }`
	`474`	`+ },`
	`475`	`+ "kind": "v-for"`
`475`	`476`	`},`
`476`	`477`	`{`
`477`	`478`	`"id": {`
`@@ -493,7 +494,8 @@`
`493`	`494`	`36`
`494`	`495`	`],`
`495`	`496`	`"name": "name"`
`496`		`- }`
	`497`	`+ },`
	`498`	`+ "kind": "v-for"`
`497`	`499`	`}`
`498`	`500`	`]`
`499`	`501`	`},`
`@@ -829,7 +831,8 @@`
`829`	`831`	`73`
`830`	`832`	`],`
`831`	`833`	`"name": "a"`
`832`		`- }`
	`834`	`+ },`
	`835`	`+ "kind": "v-for"`
`833`	`836`	`},`
`834`	`837`	`{`
`835`	`838`	`"id": {`
`@@ -851,7 +854,8 @@`
`851`	`854`	`76`
`852`	`855`	`],`
`853`	`856`	`"name": "b"`
`854`		`- }`
	`857`	`+ },`
	`858`	`+ "kind": "v-for"`
`855`	`859`	`},`
`856`	`860`	`{`
`857`	`861`	`"id": {`
`@@ -873,7 +877,8 @@`
`873`	`877`	`80`
`874`	`878`	`],`
`875`	`879`	`"name": "c"`
`876`		`- }`
	`880`	`+ },`
	`881`	`+ "kind": "v-for"`
`877`	`882`	`}`
`878`	`883`	`]`
`879`	`884`	`},`
`@@ -1188,7 +1193,8 @@`
`1188`	`1193`	`116`
`1189`	`1194`	`],`
`1190`	`1195`	`"name": "a"`
`1191`		`- }`
	`1196`	`+ },`
	`1197`	`+ "kind": "v-for"`
`1192`	`1198`	`},`
`1193`	`1199`	`{`
`1194`	`1200`	`"id": {`
`@@ -1210,7 +1216,8 @@`
`1210`	`1216`	`118`
`1211`	`1217`	`],`
`1212`	`1218`	`"name": "b"`
`1213`		`- }`
	`1219`	`+ },`
	`1220`	`+ "kind": "v-for"`
`1214`	`1221`	`}`
`1215`	`1222`	`]`
`1216`	`1223`	`},`
`@@ -1696,7 +1703,8 @@`
`1696`	`1703`	`160`
`1697`	`1704`	`],`
`1698`	`1705`	`"name": "key"`
`1699`		`- }`
	`1706`	`+ },`
	`1707`	`+ "kind": "v-for"`
`1700`	`1708`	`},`
`1701`	`1709`	`{`
`1702`	`1710`	`"id": {`
`@@ -1718,7 +1726,8 @@`
`1718`	`1726`	`167`
`1719`	`1727`	`],`
`1720`	`1728`	`"name": "name"`
`1721`		`- }`
	`1729`	`+ },`
	`1730`	`+ "kind": "v-for"`
`1722`	`1731`	`}`
`1723`	`1732`	`]`
`1724`	`1733`	`},`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@`
`344`	`344`	`28`
`345`	`345`	`],`
`346`	`346`	`"name": "a"`
`347`		`- }`
	`347`	`+ },`
	`348`	`+ "kind": "v-for"`
`348`	`349`	`}`
`349`	`350`	`]`
`350`	`351`	`},`
`@@ -658,7 +659,8 @@`
`658`	`659`	`63`
`659`	`660`	`],`
`660`	`661`	`"name": "a"`
`661`		`- }`
	`662`	`+ },`
	`663`	`+ "kind": "v-for"`
`662`	`664`	`},`
`663`	`665`	`{`
`664`	`666`	`"id": {`
`@@ -680,7 +682,8 @@`
`680`	`682`	`66`
`681`	`683`	`],`
`682`	`684`	`"name": "b"`
`683`		`- }`
	`685`	`+ },`
	`686`	`+ "kind": "v-for"`
`684`	`687`	`},`
`685`	`688`	`{`
`686`	`689`	`"id": {`
`@@ -702,7 +705,8 @@`
`702`	`705`	`69`
`703`	`706`	`],`
`704`	`707`	`"name": "c"`
`705`		`- }`
	`708`	`+ },`
	`709`	`+ "kind": "v-for"`
`706`	`710`	`}`
`707`	`711`	`]`
`708`	`712`	`},`
`@@ -976,7 +980,8 @@`
`976`	`980`	`104`
`977`	`981`	`],`
`978`	`982`	`"name": "a"`
`979`		`- }`
	`983`	`+ },`
	`984`	`+ "kind": "v-for"`
`980`	`985`	`}`
`981`	`986`	`]`
`982`	`987`	`},`
`@@ -1290,7 +1295,8 @@`
`1290`	`1295`	`139`
`1291`	`1296`	`],`
`1292`	`1297`	`"name": "a"`
`1293`		`- }`
	`1298`	`+ },`
	`1299`	`+ "kind": "v-for"`
`1294`	`1300`	`},`
`1295`	`1301`	`{`
`1296`	`1302`	`"id": {`
`@@ -1312,7 +1318,8 @@`
`1312`	`1318`	`142`
`1313`	`1319`	`],`
`1314`	`1320`	`"name": "b"`
`1315`		`- }`
	`1321`	`+ },`
	`1322`	`+ "kind": "v-for"`
`1316`	`1323`	`},`
`1317`	`1324`	`{`
`1318`	`1325`	`"id": {`
`@@ -1334,7 +1341,8 @@`
`1334`	`1341`	`145`
`1335`	`1342`	`],`
`1336`	`1343`	`"name": "c"`
`1337`		`- }`
	`1344`	`+ },`
	`1345`	`+ "kind": "v-for"`
`1338`	`1346`	`}`
`1339`	`1347`	`]`
`1340`	`1348`	`},`