Fix: rename raw → rawName

mysticatea · mysticatea · commit 45b32044b175 · 2017-08-03T07:23:07.000+09:00
diff --git a/src/ast/nodes.ts b/src/ast/nodes.ts
@@ -627,7 +627,7 @@ export interface VIdentifier extends HasLocation, HasParent {
     type: "VIdentifier"
     parent: VAttribute
     name: string
-    raw: string
+    rawName: string
 }
 
 export interface DirectiveKeyParts {
diff --git a/src/html/intermediate-tokenizer.ts b/src/html/intermediate-tokenizer.ts
@@ -359,7 +359,7 @@ export class IntermediateTokenizer {
                 loc: {start: token.loc.start, end: token.loc.end},
                 parent: DUMMY_PARENT,
                 name: token.value,
-                raw: this.text.slice(token.range[0], token.range[1]),
+                rawName: this.text.slice(token.range[0], token.range[1]),
             },
             value: null,
         }
diff --git a/src/template/index.ts b/src/template/index.ts
@@ -78,7 +78,7 @@ function createDirectiveKey(node: VIdentifier): VDirectiveKey {
         raw,
     }
     const id = node.name
-    const rawId = node.raw
+    const rawId = node.rawName
     let i = 0
 
     if (node.name.startsWith(":")) {
diff --git a/test/fixtures/ast/attributes/ast.json b/test/fixtures/ast/attributes/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": null
                         }
@@ -260,7 +260,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": null
                         }
@@ -374,7 +374,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -505,7 +505,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -636,7 +636,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -767,7 +767,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/cdata/ast.json b/test/fixtures/ast/cdata/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "width",
-                                "raw": "Width"
+                                "rawName": "Width"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -201,7 +201,7 @@
                                     }
                                 },
                                 "name": "height",
-                                "raw": "heiGht"
+                                "rawName": "heiGht"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -256,7 +256,7 @@
                                     }
                                 },
                                 "name": "viewBox",
-                                "raw": "viewbox"
+                                "rawName": "viewbox"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -462,7 +462,7 @@
                                             }
                                         },
                                         "name": "d",
-                                        "raw": "d"
+                                        "rawName": "d"
                                     },
                                     "value": {
                                         "type": "VLiteral",
diff --git a/test/fixtures/ast/error-duplicate-attribute/ast.json b/test/fixtures/ast/error-duplicate-attribute/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "id",
-                                "raw": "id"
+                                "rawName": "id"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -201,7 +201,7 @@
                                     }
                                 },
                                 "name": "id",
-                                "raw": "id"
+                                "rawName": "id"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-eof-in-tag-2/ast.json b/test/fixtures/ast/error-eof-in-tag-2/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": null
                         }
diff --git a/test/fixtures/ast/error-eof-in-tag-3/ast.json b/test/fixtures/ast/error-eof-in-tag-3/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": null
                         }
diff --git a/test/fixtures/ast/error-eof-in-tag-4/ast.json b/test/fixtures/ast/error-eof-in-tag-4/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-eof-in-tag-5/ast.json b/test/fixtures/ast/error-eof-in-tag-5/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-eof-in-tag-6/ast.json b/test/fixtures/ast/error-eof-in-tag-6/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-eof-in-tag-7/ast.json b/test/fixtures/ast/error-eof-in-tag-7/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-missing-whitespace-between-attributes/ast.json b/test/fixtures/ast/error-missing-whitespace-between-attributes/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -201,7 +201,7 @@
                                     }
                                 },
                                 "name": "c",
-                                "raw": "c"
+                                "rawName": "c"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-unexpected-character-in-attribute-name/ast.json b/test/fixtures/ast/error-unexpected-character-in-attribute-name/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a\"",
-                                "raw": "a\""
+                                "rawName": "a\""
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -201,7 +201,7 @@
                                     }
                                 },
                                 "name": "c<d",
-                                "raw": "c<d"
+                                "rawName": "c<d"
                             },
                             "value": null
                         },
@@ -239,7 +239,7 @@
                                     }
                                 },
                                 "name": "e'f",
-                                "raw": "e'f"
+                                "rawName": "e'f"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-unexpected-character-in-unquoted-attribute-value/ast.json b/test/fixtures/ast/error-unexpected-character-in-unquoted-attribute-value/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "foo",
-                                "raw": "foo"
+                                "rawName": "foo"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-unexpected-equals-sign-before-attribute-name/ast.json b/test/fixtures/ast/error-unexpected-equals-sign-before-attribute-name/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "=abc",
-                                "raw": "=abc"
+                                "rawName": "=abc"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/error-unexpected-solidus-in-tag/ast.json b/test/fixtures/ast/error-unexpected-solidus-in-tag/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "a",
-                                "raw": "a"
+                                "rawName": "a"
                             },
                             "value": null
                         },
@@ -184,7 +184,7 @@
                                     }
                                 },
                                 "name": "b",
-                                "raw": "b"
+                                "rawName": "b"
                             },
                             "value": null
                         }
diff --git a/test/fixtures/ast/error-x-invalid-namespace/ast.json b/test/fixtures/ast/error-x-invalid-namespace/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -277,7 +277,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -408,7 +408,7 @@
                                     }
                                 },
                                 "name": "xmlns:xlink",
-                                "raw": "xmlns:xlink"
+                                "rawName": "xmlns:xlink"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -539,7 +539,7 @@
                                     }
                                 },
                                 "name": "xmlns:foo",
-                                "raw": "xmlns:foo"
+                                "rawName": "xmlns:foo"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -670,7 +670,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": null
                         }
@@ -784,7 +784,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -915,7 +915,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -1046,7 +1046,7 @@
                                     }
                                 },
                                 "name": "xmlns",
-                                "raw": "xmlns"
+                                "rawName": "xmlns"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -1177,7 +1177,7 @@
                                     }
                                 },
                                 "name": "xmlns:xlink",
-                                "raw": "xmlns:xlink"
+                                "rawName": "xmlns:xlink"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/foreignobject/ast.json b/test/fixtures/ast/foreignobject/ast.json
@@ -202,7 +202,7 @@
                                             }
                                         },
                                         "name": "d",
-                                        "raw": "d"
+                                        "rawName": "d"
                                     },
                                     "value": {
                                         "type": "VLiteral",
diff --git a/test/fixtures/ast/html-entities-in-static-places/ast.json b/test/fixtures/ast/html-entities-in-static-places/ast.json
@@ -164,7 +164,7 @@
                                     }
                                 },
                                 "name": "foo",
-                                "raw": "foo"
+                                "rawName": "foo"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -219,7 +219,7 @@
                                     }
                                 },
                                 "name": "bar",
-                                "raw": "bar"
+                                "rawName": "bar"
                             },
                             "value": {
                                 "type": "VLiteral",
@@ -274,7 +274,7 @@
                                     }
                                 },
                                 "name": "baz",
-                                "raw": "baz"
+                                "rawName": "baz"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/html-entities-special-in-attributes/ast.json b/test/fixtures/ast/html-entities-special-in-attributes/ast.json
@@ -146,7 +146,7 @@
                                     }
                                 },
                                 "name": "foo",
-                                "raw": "foo"
+                                "rawName": "foo"
                             },
                             "value": {
                                 "type": "VLiteral",
diff --git a/test/fixtures/ast/math/ast.json b/test/fixtures/ast/math/ast.json
diff --git a/test/fixtures/ast/mustache-errors/ast.json b/test/fixtures/ast/mustache-errors/ast.json
diff --git a/test/fixtures/ast/raw-names/ast.json b/test/fixtures/ast/raw-names/ast.json
diff --git a/test/fixtures/ast/v-on-multiple-statements/ast.json b/test/fixtures/ast/v-on-multiple-statements/ast.json

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ export interface VIdentifier extends HasLocation, HasParent {`
`627`	`627`	`type: "VIdentifier"`
`628`	`628`	`parent: VAttribute`
`629`	`629`	`name: string`
`630`		`- raw: string`
	`630`	`+ rawName: string`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`export interface DirectiveKeyParts {`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ export class IntermediateTokenizer {`
`359`	`359`	`loc: {start: token.loc.start, end: token.loc.end},`
`360`	`360`	`parent: DUMMY_PARENT,`
`361`	`361`	`name: token.value,`
`362`		`- raw: this.text.slice(token.range[0], token.range[1]),`
	`362`	`+ rawName: this.text.slice(token.range[0], token.range[1]),`
`363`	`363`	`},`
`364`	`364`	`value: null,`
`365`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ function createDirectiveKey(node: VIdentifier): VDirectiveKey {`
`78`	`78`	`raw,`
`79`	`79`	`}`
`80`	`80`	`const id = node.name`
`81`		`- const rawId = node.raw`
	`81`	`+ const rawId = node.rawName`
`82`	`82`	`let i = 0`
`83`	`83`
`84`	`84`	`if (node.name.startsWith(":")) {`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@`
`146`	`146`	`}`
`147`	`147`	`},`
`148`	`148`	`"name": "a",`
`149`		`- "raw": "a"`
	`149`	`+ "rawName": "a"`
`150`	`150`	`},`
`151`	`151`	`"value": null`
`152`	`152`	`}`