Update AST (#3)

ota-meshi · web-flow · commit 2a44c39fc221 · 2020-07-12T16:48:12.000+09:00
* Update AST

* update
diff --git a/.github/workflows/NodeCI.yml b/.github/workflows/NodeCI.yml
@@ -57,6 +57,6 @@ jobs:
     - name: Test
       run: npm run test:nyc
     - name: Coveralls GitHub Action
-      uses: coverallsapp/github-action@v1.0.1
+      uses: coverallsapp/github-action@v1.1.1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/lib/parser/ast.ts b/lib/parser/ast.ts
@@ -65,6 +65,10 @@ export interface JSONProperty extends BaseJSONNode {
     type: "JSONProperty"
     key: JSONIdentifier | JSONLiteral
     value: JSONExpression
+    kind: "init"
+    method: false
+    shorthand: false
+    computed: false
     parent?: JSONObjectExpression
 }
 
diff --git a/lib/parser/convert.ts b/lib/parser/convert.ts
@@ -172,6 +172,10 @@ function convertPropertyNode(
         type: "JSONProperty",
         key: convertNode(node.key, tokens) as JSONLiteral | JSONIdentifier,
         value: convertNode(node.value, tokens) as JSONExpression,
+        kind: node.kind,
+        computed: node.computed,
+        method: node.method,
+        shorthand: node.shorthand,
         ...getFixLocation(node),
     }
     checkUnexpectKeys(node, tokens, nn)
@@ -284,7 +288,7 @@ function convertUnaryExpressionNode(
     const nn: JSONUnaryExpression = {
         type: "JSONUnaryExpression",
         operator,
-        prefix: true,
+        prefix: node.prefix,
         argument: convertNode(argument, tokens) as
             | JSONNumberLiteral
             | JSONNumberIdentifier,
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -72,18 +72,12 @@ export function defineWrapperListener(
      * Get the proxy node
      */
     function getProxyNode(node: JSONNode): any {
-        const cache: any = {}
         const type = node.type.startsWith("JSON")
             ? node.type.slice(4)
             : node.type
+        const cache: any = { type }
         return new Proxy(node, {
             get(_t, key) {
-                if (key === "type") {
-                    return type
-                }
-                if (key === "kind" && node.type === "JSONProperty") {
-                    return "init"
-                }
                 if (key in cache) {
                     return cache[key]
                 }
diff --git a/tests/fixtures/parser/ast/infinity-02-output.json b/tests/fixtures/parser/ast/infinity-02-output.json
@@ -44,6 +44,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               6,
               17
@@ -116,6 +120,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               23,
               35
@@ -188,6 +196,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               41,
               52
diff --git a/tests/fixtures/parser/ast/nan-02-output.json b/tests/fixtures/parser/ast/nan-02-output.json
@@ -44,6 +44,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               6,
               12
@@ -116,6 +120,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               18,
               25
@@ -188,6 +196,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               31,
               37
diff --git a/tests/fixtures/parser/ast/object-01-output.json b/tests/fixtures/parser/ast/object-01-output.json
@@ -46,6 +46,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               1,
               12
diff --git a/tests/fixtures/parser/ast/object-02-output.json b/tests/fixtures/parser/ast/object-02-output.json
@@ -68,6 +68,10 @@
                       }
                     }
                   },
+                  "kind": "init",
+                  "computed": false,
+                  "method": false,
+                  "shorthand": false,
                   "range": [
                     21,
                     27
@@ -123,6 +127,10 @@
                       }
                     }
                   },
+                  "kind": "init",
+                  "computed": false,
+                  "method": false,
+                  "shorthand": false,
                   "range": [
                     37,
                     45
@@ -154,6 +162,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               6,
               51
diff --git a/tests/fixtures/parser/ast/object-03-output.json b/tests/fixtures/parser/ast/object-03-output.json
@@ -69,6 +69,10 @@
                       }
                     }
                   },
+                  "kind": "init",
+                  "computed": false,
+                  "method": false,
+                  "shorthand": false,
                   "range": [
                     23,
                     29
@@ -123,6 +127,10 @@
                       }
                     }
                   },
+                  "kind": "init",
+                  "computed": false,
+                  "method": false,
+                  "shorthand": false,
                   "range": [
                     39,
                     45
@@ -154,6 +162,10 @@
                 }
               }
             },
+            "kind": "init",
+            "computed": false,
+            "method": false,
+            "shorthand": false,
             "range": [
               6,
               52

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,10 @@`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`},`
	`47`	`+ "kind": "init",`
	`48`	`+ "computed": false,`
	`49`	`+ "method": false,`
	`50`	`+ "shorthand": false,`
`47`	`51`	`"range": [`
`48`	`52`	`6,`
`49`	`53`	`17`
`@@ -116,6 +120,10 @@`
`116`	`120`	`}`
`117`	`121`	`}`
`118`	`122`	`},`
	`123`	`+ "kind": "init",`
	`124`	`+ "computed": false,`
	`125`	`+ "method": false,`
	`126`	`+ "shorthand": false,`
`119`	`127`	`"range": [`
`120`	`128`	`23,`
`121`	`129`	`35`
`@@ -188,6 +196,10 @@`
`188`	`196`	`}`
`189`	`197`	`}`
`190`	`198`	`},`
	`199`	`+ "kind": "init",`
	`200`	`+ "computed": false,`
	`201`	`+ "method": false,`
	`202`	`+ "shorthand": false,`
`191`	`203`	`"range": [`
`192`	`204`	`41,`
`193`	`205`	`52`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`},`
	`49`	`+ "kind": "init",`
	`50`	`+ "computed": false,`
	`51`	`+ "method": false,`
	`52`	`+ "shorthand": false,`
`49`	`53`	`"range": [`
`50`	`54`	`1,`
`51`	`55`	`12`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`},`
	`71`	`+ "kind": "init",`
	`72`	`+ "computed": false,`
	`73`	`+ "method": false,`
	`74`	`+ "shorthand": false,`
`71`	`75`	`"range": [`
`72`	`76`	`21,`
`73`	`77`	`27`
`@@ -123,6 +127,10 @@`
`123`	`127`	`}`
`124`	`128`	`}`
`125`	`129`	`},`
	`130`	`+ "kind": "init",`
	`131`	`+ "computed": false,`
	`132`	`+ "method": false,`
	`133`	`+ "shorthand": false,`
`126`	`134`	`"range": [`
`127`	`135`	`37,`
`128`	`136`	`45`
`@@ -154,6 +162,10 @@`
`154`	`162`	`}`
`155`	`163`	`}`
`156`	`164`	`},`
	`165`	`+ "kind": "init",`
	`166`	`+ "computed": false,`
	`167`	`+ "method": false,`
	`168`	`+ "shorthand": false,`
`157`	`169`	`"range": [`
`158`	`170`	`6,`
`159`	`171`	`51`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`},`
	`72`	`+ "kind": "init",`
	`73`	`+ "computed": false,`
	`74`	`+ "method": false,`
	`75`	`+ "shorthand": false,`
`72`	`76`	`"range": [`
`73`	`77`	`23,`
`74`	`78`	`29`
`@@ -123,6 +127,10 @@`
`123`	`127`	`}`
`124`	`128`	`}`
`125`	`129`	`},`
	`130`	`+ "kind": "init",`
	`131`	`+ "computed": false,`
	`132`	`+ "method": false,`
	`133`	`+ "shorthand": false,`
`126`	`134`	`"range": [`
`127`	`135`	`39,`
`128`	`136`	`45`
`@@ -154,6 +162,10 @@`
`154`	`162`	`}`
`155`	`163`	`}`
`156`	`164`	`},`
	`165`	`+ "kind": "init",`
	`166`	`+ "computed": false,`
	`167`	`+ "method": false,`
	`168`	`+ "shorthand": false,`
`157`	`169`	`"range": [`
`158`	`170`	`6,`
`159`	`171`	`52`