root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

refactor: restore SourceLocation.source 

this is used extensively in @vue/language-tools and does not have
noticeable impact on performance
This commit is contained in:
Evan You 2023-11-25 19:22:39 +08:00
parent 08f0baa2ad
commit e48cbf02be
9 changed files with 496 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap
View File

File diff suppressed because it is too large Load Diff

315
packages/compiler-core/__tests__/parse.spec.ts
View File

@ -28,7 +28,8 @@ describe('compiler: parse', () => {
content: 'some text',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'some text'
}
})
})
@ -55,7 +56,8 @@ describe('compiler: parse', () => {
content: 'some text',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'some text'
}
})
})
@ -70,7 +72,8 @@ describe('compiler: parse', () => {
content: 'some ',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: 'some '
}
})
expect(text2).toStrictEqual({
@ -78,7 +81,8 @@ describe('compiler: parse', () => {
content: ' text',
loc: {
start: { offset: 20, line: 1, column: 21 },
end: { offset: 25, line: 1, column: 26 }
end: { offset: 25, line: 1, column: 26 },
source: ' text'
}
})
})
@ -93,7 +97,8 @@ describe('compiler: parse', () => {
content: 'some ',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: 'some '
}
})
expect(text2).toStrictEqual({
@ -101,7 +106,8 @@ describe('compiler: parse', () => {
content: ' text',
loc: {
start: { offset: 21, line: 1, column: 22 },
end: { offset: 26, line: 1, column: 27 }
end: { offset: 26, line: 1, column: 27 },
source: ' text'
}
})
})
@ -116,7 +122,8 @@ describe('compiler: parse', () => {
content: 'some ',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: 'some '
}
})
expect(text2).toStrictEqual({
@ -124,7 +131,8 @@ describe('compiler: parse', () => {
content: ' text',
loc: {
start: { offset: 32, line: 1, column: 33 },
end: { offset: 37, line: 1, column: 38 }
end: { offset: 37, line: 1, column: 38 },
source: ' text'
}
})
})
@ -144,7 +152,8 @@ describe('compiler: parse', () => {
content: 'a < b',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: 'a < b'
}
})
})
@ -164,7 +173,8 @@ describe('compiler: parse', () => {
content: 'a {{ b',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: 'a {{ b'
}
})
})
@ -184,12 +194,14 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 2, line: 1, column: 3 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'message'
}
},
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 11, line: 1, column: 12 }
end: { offset: 11, line: 1, column: 12 },
source: '{{message}}'
}
})
})
@ -207,12 +219,14 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 3, line: 1, column: 4 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: 'a<b'
}
},
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: '{{ a<b }}'
}
})
})
@ -231,12 +245,14 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 3, line: 1, column: 4 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: 'a<b'
}
},
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: '{{ a<b }}'
}
})
@ -249,12 +265,14 @@ describe('compiler: parse', () => {
content: 'c>d',
loc: {
start: { offset: 12, line: 1, column: 13 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: 'c>d'
}
},
loc: {
start: { offset: 9, line: 1, column: 10 },
end: { offset: 18, line: 1, column: 19 }
end: { offset: 18, line: 1, column: 19 },
source: '{{ c>d }}'
}
})
})
@ -274,12 +292,14 @@ describe('compiler: parse', () => {
content: '"</div>"',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 16, line: 1, column: 17 }
end: { offset: 16, line: 1, column: 17 },
source: '"</div>"'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: '{{ "</div>" }}'
}
})
})
@ -300,12 +320,14 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 4, line: 1, column: 5 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'msg'
}
},
loc: {
start: { offset: 3, line: 1, column: 4 },
end: { offset: 8, line: 1, column: 9 }
end: { offset: 8, line: 1, column: 9 },
source: '{msg}'
}
})
})
@ -321,7 +343,8 @@ describe('compiler: parse', () => {
content: '',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: '<!---->'
}
})
})
@ -335,7 +358,8 @@ describe('compiler: parse', () => {
content: 'abc',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: '<!--abc-->'
}
})
})
@ -350,7 +374,8 @@ describe('compiler: parse', () => {
content: 'abc',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: '<!--abc-->'
}
})
expect(comment2).toStrictEqual({
@ -358,7 +383,8 @@ describe('compiler: parse', () => {
content: 'def',
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 20, line: 1, column: 21 }
end: { offset: 20, line: 1, column: 21 },
source: '<!--def-->'
}
})
})
@ -430,13 +456,15 @@ describe('compiler: parse', () => {
content: 'hello',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: 'hello'
}
}
],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 16, line: 1, column: 17 }
end: { offset: 16, line: 1, column: 17 },
source: '<div>hello</div>'
}
})
})
@ -455,7 +483,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 11, line: 1, column: 12 }
end: { offset: 11, line: 1, column: 12 },
source: '<div></div>'
}
})
})
@ -474,7 +503,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: '<div/>'
}
})
})
@ -495,7 +525,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: '<img>'
}
})
})
@ -516,7 +547,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: '<img/>'
}
})
})
@ -703,12 +735,14 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
}
}
],
@ -716,7 +750,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 14, line: 1, column: 15 }
end: { offset: 14, line: 1, column: 15 },
source: '<div id></div>'
}
})
})
@ -737,19 +772,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: '',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: '""'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: 'id=""'
}
}
],
@ -757,7 +795,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 17, line: 1, column: 18 }
end: { offset: 17, line: 1, column: 18 },
source: '<div id=""></div>'
}
})
})
@ -778,19 +817,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: '',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: "''"
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: "id=''"
}
}
],
@ -798,7 +840,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 17, line: 1, column: 18 }
end: { offset: 17, line: 1, column: 18 },
source: "<div id=''></div>"
}
})
})
@ -819,19 +862,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: ">'",
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: '">\'"'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: 'id=">\'"'
}
}
],
@ -839,7 +885,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: '<div id=">\'"></div>'
}
})
})
@ -860,19 +907,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: '>"',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: "'>\"'"
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: "id='>\"'"
}
}
],
@ -880,7 +930,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: "<div id='>\"'></div>"
}
})
})
@ -901,19 +952,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: 'a/',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: 'a/'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: 'id=a/'
}
}
],
@ -921,7 +975,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 17, line: 1, column: 18 }
end: { offset: 17, line: 1, column: 18 },
source: '<div id=a/></div>'
}
})
})
@ -942,19 +997,22 @@ describe('compiler: parse', () => {
name: 'id',
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'id'
},
value: {
type: NodeTypes.TEXT,
content: 'a',
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'a'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'id=a'
}
},
{
@ -962,19 +1020,22 @@ describe('compiler: parse', () => {
name: 'class',
nameLoc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: 'class'
},
value: {
type: NodeTypes.TEXT,
content: 'c',
loc: {
start: { offset: 16, line: 1, column: 17 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: '"c"'
}
},
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: 'class="c"'
}
},
{
@ -982,12 +1043,14 @@ describe('compiler: parse', () => {
name: 'inert',
nameLoc: {
start: { offset: 20, line: 1, column: 21 },
end: { offset: 25, line: 1, column: 26 }
end: { offset: 25, line: 1, column: 26 },
source: 'inert'
},
value: undefined,
loc: {
start: { offset: 20, line: 1, column: 21 },
end: { offset: 25, line: 1, column: 26 }
end: { offset: 25, line: 1, column: 26 },
source: 'inert'
}
},
{
@ -995,19 +1058,22 @@ describe('compiler: parse', () => {
name: 'style',
nameLoc: {
start: { offset: 26, line: 1, column: 27 },
end: { offset: 31, line: 1, column: 32 }
end: { offset: 31, line: 1, column: 32 },
source: 'style'
},
value: {
type: NodeTypes.TEXT,
content: '',
loc: {
start: { offset: 32, line: 1, column: 33 },
end: { offset: 34, line: 1, column: 35 }
end: { offset: 34, line: 1, column: 35 },
source: "''"
}
},
loc: {
start: { offset: 26, line: 1, column: 27 },
end: { offset: 34, line: 1, column: 35 }
end: { offset: 34, line: 1, column: 35 },
source: "style=''"
}
}
],
@ -1015,7 +1081,8 @@ describe('compiler: parse', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 41, line: 1, column: 42 }
end: { offset: 41, line: 1, column: 42 },
source: '<div id=a class="c" inert style=\'\'></div>'
}
})
})
@ -1030,7 +1097,8 @@ describe('compiler: parse', () => {
codegenNode: undefined,
loc: {
start: { column: 1, line: 1, offset: 0 },
end: { column: 10, line: 3, offset: 29 }
end: { column: 10, line: 3, offset: 29 },
source: '<div class=" \n\t c \t\n "></div>'
},
ns: Namespaces.HTML,
props: [
@ -1038,20 +1106,23 @@ describe('compiler: parse', () => {
name: 'class',
nameLoc: {
start: { column: 6, line: 1, offset: 5 },
end: { column: 11, line: 1, offset: 10 }
end: { column: 11, line: 1, offset: 10 },
source: 'class'
},
type: NodeTypes.ATTRIBUTE,
value: {
content: 'c',
loc: {
start: { column: 12, line: 1, offset: 11 },
end: { column: 3, line: 3, offset: 22 }
end: { column: 3, line: 3, offset: 22 },
source: '" \n\t c \t\n "'
},
type: NodeTypes.TEXT
},
loc: {
start: { column: 6, line: 1, offset: 5 },
end: { column: 3, line: 3, offset: 22 }
end: { column: 3, line: 3, offset: 22 },
source: 'class=" \n\t c \t\n "'
}
}
],
@ -1075,7 +1146,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'v-if'
}
})
})
@ -1097,13 +1169,15 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 11, line: 1, column: 12 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: 'a'
}
},
rawExp: 'a',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 13, line: 1, column: 14 }
end: { offset: 13, line: 1, column: 14 },
source: 'v-if="a"'
}
})
})
@ -1123,7 +1197,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 11, line: 1, offset: 10 },
end: { column: 16, line: 1, offset: 15 }
end: { column: 16, line: 1, offset: 15 },
source: 'click'
}
},
modifiers: [],
@ -1131,7 +1206,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: 'v-on:click'
}
})
})
@ -1178,7 +1254,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { column: 11, line: 1, offset: 10 },
end: { column: 18, line: 1, offset: 17 }
end: { column: 18, line: 1, offset: 17 },
source: '[event]'
}
},
modifiers: [],
@ -1186,7 +1263,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 17, line: 1, column: 18 }
end: { offset: 17, line: 1, column: 18 },
source: 'v-on:[event]'
}
})
})
@ -1205,7 +1283,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: 'v-on.enter'
}
})
})
@ -1224,7 +1303,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 21, line: 1, column: 22 }
end: { offset: 21, line: 1, column: 22 },
source: 'v-on.enter.exact'
}
})
})
@ -1244,7 +1324,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 11, line: 1, offset: 10 },
end: { column: 16, line: 1, offset: 15 }
end: { column: 16, line: 1, offset: 15 },
source: 'click'
}
},
modifiers: ['enter', 'exact'],
@ -1252,7 +1333,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 27, line: 1, column: 28 }
end: { offset: 27, line: 1, column: 28 },
source: 'v-on:click.enter.exact'
}
})
})
@ -1272,7 +1354,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { column: 11, line: 1, offset: 10 },
end: { column: 16, line: 1, offset: 15 }
end: { column: 16, line: 1, offset: 15 },
source: '[a.b]'
}
},
modifiers: ['camel'],
@ -1280,7 +1363,8 @@ describe('compiler: parse', () => {
rawExp: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 21, line: 1, column: 22 }
end: { offset: 21, line: 1, column: 22 },
source: 'v-on:[a.b].camel'
}
})
})
@ -1301,11 +1385,13 @@ describe('compiler: parse', () => {
value: undefined,
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'v-'
},
nameLoc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 7, line: 1, column: 8 }
end: { offset: 7, line: 1, column: 8 },
source: 'v-'
}
})
})
@ -1325,7 +1411,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 7, line: 1, offset: 6 },
end: { column: 8, line: 1, offset: 7 }
end: { column: 8, line: 1, offset: 7 },
source: 'a'
}
},
modifiers: [],
@ -1336,13 +1423,15 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'b'
}
},
rawExp: 'b',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: ':a=b'
}
})
})
@ -1362,7 +1451,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 7, line: 1, offset: 6 },
end: { column: 8, line: 1, offset: 7 }
end: { column: 8, line: 1, offset: 7 },
source: 'a'
}
},
modifiers: ['prop'],
@ -1373,13 +1463,15 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'b'
}
},
rawExp: 'b',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: '.a=b'
}
})
})
@ -1399,7 +1491,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 7, line: 1, offset: 6 },
end: { column: 8, line: 1, offset: 7 }
end: { column: 8, line: 1, offset: 7 },
source: 'a'
}
},
modifiers: ['sync'],
@ -1411,13 +1504,15 @@ describe('compiler: parse', () => {
loc: {
start: { offset: 13, line: 1, column: 14 },
end: { offset: 14, line: 1, column: 15 }
end: { offset: 14, line: 1, column: 15 },
source: 'b'
}
},
rawExp: 'b',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 14, line: 1, column: 15 }
end: { offset: 14, line: 1, column: 15 },
source: ':a.sync=b'
}
})
})
@ -1437,7 +1532,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 7, line: 1, offset: 6 },
end: { column: 8, line: 1, offset: 7 }
end: { column: 8, line: 1, offset: 7 },
source: 'a'
}
},
modifiers: [],
@ -1449,13 +1545,15 @@ describe('compiler: parse', () => {
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: 'b'
}
},
rawExp: 'b',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 9, line: 1, column: 10 }
end: { offset: 9, line: 1, column: 10 },
source: '@a=b'
}
})
})
@ -1475,7 +1573,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 7, line: 1, offset: 6 },
end: { column: 8, line: 1, offset: 7 }
end: { column: 8, line: 1, offset: 7 },
source: 'a'
}
},
modifiers: ['enter'],
@ -1487,13 +1586,15 @@ describe('compiler: parse', () => {
loc: {
start: { offset: 14, line: 1, column: 15 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: 'b'
}
},
rawExp: 'b',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: '@a.enter=b'
}
})
})
@ -1513,7 +1614,8 @@ describe('compiler: parse', () => {
constType: ConstantTypes.CAN_STRINGIFY,
loc: {
start: { column: 8, line: 1, offset: 7 },
end: { column: 9, line: 1, offset: 8 }
end: { column: 9, line: 1, offset: 8 },
source: 'a'
}
},
modifiers: [],
@ -1525,13 +1627,15 @@ describe('compiler: parse', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: '{ b }'
}
},
rawExp: '{ b }',
loc: {
start: { offset: 6, line: 1, column: 7 },
end: { offset: 16, line: 1, column: 17 }
end: { offset: 16, line: 1, column: 17 },
source: '#a="{ b }"'
}
})
})
@ -1697,7 +1801,8 @@ describe('compiler: parse', () => {
content: 'hello',
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 10, line: 1, column: 11 }
end: { offset: 10, line: 1, column: 11 },
source: 'hello'
}
})
})

9
packages/compiler-core/src/ast.ts
View File

@ -76,6 +76,7 @@ export interface Node {
export interface SourceLocation {
start: Position
end: Position
source: string
}
export interface Position {
@ -198,11 +199,6 @@ export interface DirectiveNode extends Node {
*/
rawName?: string
exp: ExpressionNode | undefined
/**
* the raw expression as a string
* only required on directives parsed from templates
*/
rawExp?: string
arg: ExpressionNode | undefined
modifiers: string[]
/**
@ -570,7 +566,8 @@ export interface ForIteratorExpression extends FunctionExpression {
// Container types like CompoundExpression also don't need a real location.
export const locStub: SourceLocation = {
start: { line: 1, column: 1, offset: 0 },
end: { line: 1, column: 1, offset: 0 }
end: { line: 1, column: 1, offset: 0 },
source: ''
}
export function createRoot(

29
packages/compiler-core/src/parser.ts
View File

@ -218,7 +218,6 @@ const tokenizer = new Tokenizer(stack, {
name,
rawName: raw,
exp: undefined,
rawExp: undefined,
arg: undefined,
modifiers: raw === '.' ? ['prop'] : [],
loc: getLoc(start)
@ -241,7 +240,7 @@ const tokenizer = new Tokenizer(stack, {
const arg = getSlice(start, end)
if (inVPre) {
;(currentProp as AttributeNode).name += arg
;(currentProp as AttributeNode).nameLoc.end = tokenizer.getPos(end)
setLocEnd((currentProp as AttributeNode).nameLoc, end)
} else {
const isStatic = arg[0] !== `[`
;(currentProp as DirectiveNode).arg = createSimpleExpression(
@ -257,14 +256,14 @@ const tokenizer = new Tokenizer(stack, {
const mod = getSlice(start, end)
if (inVPre) {
;(currentProp as AttributeNode).name += '.' + mod
;(currentProp as AttributeNode).nameLoc.end = tokenizer.getPos(end)
setLocEnd((currentProp as AttributeNode).nameLoc, end)
} else if ((currentProp as DirectiveNode).name === 'slot') {
// slot has no modifiers, special case for edge cases like
// https://github.com/vuejs/language-tools/issues/2710
const arg = (currentProp as DirectiveNode).arg
if (arg) {
;(arg as SimpleExpressionNode).content += '.' + mod
arg.loc.end = tokenizer.getPos(end)
setLocEnd(arg.loc, end)
}
} else {
;(currentProp as DirectiveNode).modifiers.push(mod)
@ -302,7 +301,7 @@ const tokenizer = new Tokenizer(stack, {
onattribend(quote, end) {
if (currentOpenTag && currentProp) {
// finalize end pos
currentProp.loc.end = tokenizer.getPos(end)
setLocEnd(currentProp.loc, end)
if (quote !== QuoteType.NoValue) {
if (__BROWSER__ && currentAttrValue.includes('&')) {
@ -345,7 +344,6 @@ const tokenizer = new Tokenizer(stack, {
}
} else {
// directive
currentProp.rawExp = currentAttrValue
currentProp.exp = createSimpleExpression(
currentAttrValue,
false,
@ -562,7 +560,7 @@ function onText(content: string, start: number, end: number) {
if (lastNode?.type === NodeTypes.TEXT) {
// merge
lastNode.content += content
lastNode.loc.end = tokenizer.getPos(end)
setLocEnd(lastNode.loc, end)
} else {
parent.children.push({
type: NodeTypes.TEXT,
@ -576,9 +574,9 @@ function onCloseTag(el: ElementNode, end: number, isImplied = false) {
// attach end position
if (isImplied) {
// implied close, end should be backtracked to close
el.loc.end = tokenizer.getPos(backTrack(end, CharCodes.Lt))
setLocEnd(el.loc, backTrack(end, CharCodes.Lt))
} else {
el.loc.end = tokenizer.getPos(end + fastForward(end, CharCodes.Gt) + 1)
setLocEnd(el.loc, end + fastForward(end, CharCodes.Gt) + 1)
}
if (tokenizer.inSFCRoot) {
@ -588,6 +586,10 @@ function onCloseTag(el: ElementNode, end: number, isImplied = false) {
} else {
el.innerLoc!.end = extend({}, el.innerLoc!.start)
}
el.innerLoc!.source = getSlice(
el.innerLoc!.start.offset,
el.innerLoc!.end.offset
)
}
// refine element type
@ -885,10 +887,17 @@ function getLoc(start: number, end?: number): SourceLocation {
return {
start: tokenizer.getPos(start),
// @ts-expect-error allow late attachment
end: end && tokenizer.getPos(end)
end: end == null ? end : tokenizer.getPos(end),
// @ts-expect-error allow late attachment
source: end == null ? end : getSlice(start, end)
}
}
function setLocEnd(loc: SourceLocation, end: number) {
loc.end = tokenizer.getPos(end)
loc.source = getSlice(loc.start.offset, end)
}
function dirToAttr(dir: DirectiveNode): AttributeNode {
const attr: AttributeNode = {
type: NodeTypes.ATTRIBUTE,

3
packages/compiler-core/src/transforms/transformElement.ts
View File

@ -158,7 +158,8 @@ export const transformElement: NodeTransform = (node, context) => {
context.onError(
createCompilerError(ErrorCodes.X_KEEP_ALIVE_INVALID_CHILDREN, {
start: node.children[0].loc.start,
end: node.children[node.children.length - 1].loc.end
end: node.children[node.children.length - 1].loc.end,
source: ''
})
)
}

3
packages/compiler-core/src/transforms/transformExpression.ts
View File

@ -337,7 +337,8 @@ export function processExpression(
false,
{
start: advancePositionWithClone(node.loc.start, source, start),
end: advancePositionWithClone(node.loc.start, source, end)
end: advancePositionWithClone(node.loc.start, source, end),
source
},
id.isConstant ? ConstantTypes.CAN_STRINGIFY : ConstantTypes.NOT_CONSTANT
)

2
packages/compiler-core/src/transforms/vModel.ts
View File

@ -31,7 +31,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
// we assume v-model directives are always parsed
// (not artificially created by a transform)
const rawExp = dir.rawExp!
const rawExp = exp.loc.source
const expString =
exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : rawExp

42
packages/compiler-dom/__tests__/parse.spec.ts
View File

@ -26,7 +26,8 @@ describe('DOM parser', () => {
content: 'some<div>text</div>and<!--comment-->',
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 46, line: 1, column: 47 }
end: { offset: 46, line: 1, column: 47 },
source: 'some<div>text</div>and<!--comment-->'
}
})
})
@ -41,7 +42,8 @@ describe('DOM parser', () => {
content: '&',
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 15, line: 1, column: 16 }
end: { offset: 15, line: 1, column: 16 },
source: '&amp;'
}
})
})
@ -75,7 +77,8 @@ describe('DOM parser', () => {
content: 'some<div>text</div>and<!--comment-->',
loc: {
start: { offset: 7, line: 1, column: 8 },
end: { offset: 43, line: 1, column: 44 }
end: { offset: 43, line: 1, column: 44 },
source: 'some<div>text</div>and<!--comment-->'
}
})
})
@ -90,7 +93,8 @@ describe('DOM parser', () => {
content: '&amp;',
loc: {
start: { offset: 7, line: 1, column: 8 },
end: { offset: 12, line: 1, column: 13 }
end: { offset: 12, line: 1, column: 13 },
source: '&amp;'
}
})
})
@ -104,7 +108,8 @@ describe('DOM parser', () => {
content: 'some text',
loc: {
start: { offset: 14, line: 1, column: 15 },
end: { offset: 23, line: 1, column: 24 }
end: { offset: 23, line: 1, column: 24 },
source: 'some text'
}
})
})
@ -175,7 +180,8 @@ describe('DOM parser', () => {
content: '&ersand;',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 11, line: 1, column: 12 }
end: { offset: 11, line: 1, column: 12 },
source: '&ampersand;'
}
})
})
@ -196,7 +202,8 @@ describe('DOM parser', () => {
content: '&ampersand;',
loc: {
start: { offset: 7, line: 1, column: 8 },
end: { offset: 20, line: 1, column: 21 }
end: { offset: 20, line: 1, column: 21 },
source: '"&ampersand;"'
}
})
expect(text2).toStrictEqual({
@ -204,7 +211,8 @@ describe('DOM parser', () => {
content: '&ersand;',
loc: {
start: { offset: 23, line: 1, column: 24 },
end: { offset: 37, line: 1, column: 38 }
end: { offset: 37, line: 1, column: 38 },
source: '"&amp;ersand;"'
}
})
expect(text3).toStrictEqual({
@ -212,7 +220,8 @@ describe('DOM parser', () => {
content: '&!',
loc: {
start: { offset: 40, line: 1, column: 41 },
end: { offset: 47, line: 1, column: 48 }
end: { offset: 47, line: 1, column: 48 },
source: '"&amp!"'
}
})
})
@ -226,7 +235,8 @@ describe('DOM parser', () => {
content: '†',
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 6, line: 1, column: 7 }
end: { offset: 6, line: 1, column: 7 },
source: '&#x86;'
}
})
})
@ -247,12 +257,14 @@ describe('DOM parser', () => {
constType: ConstantTypes.NOT_CONSTANT,
loc: {
start: { offset: 8, line: 1, column: 9 },
end: { offset: 16, line: 1, column: 17 }
end: { offset: 16, line: 1, column: 17 },
source: 'a &lt; b'
}
},
loc: {
start: { offset: 5, line: 1, column: 6 },
end: { offset: 19, line: 1, column: 20 }
end: { offset: 19, line: 1, column: 20 },
source: '{{ a &lt; b }}'
}
})
})
@ -272,7 +284,8 @@ describe('DOM parser', () => {
children: [],
loc: {
start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }
end: { offset: 5, line: 1, column: 6 },
source: '<img>'
},
codegenNode: undefined
})
@ -314,7 +327,8 @@ describe('DOM parser', () => {
content: 'hello</textarea</textarea0>',
loc: {
start: { offset: 10, line: 1, column: 11 },
end: { offset: 37, line: 1, column: 38 }
end: { offset: 37, line: 1, column: 38 },
source: 'hello</textarea</textarea0>'
}
})
})

3
packages/compiler-dom/src/transforms/Transition.ts
View File

@ -27,7 +27,8 @@ export const transformTransition: NodeTransform = (node, context) => {
DOMErrorCodes.X_TRANSITION_INVALID_CHILDREN,
{
start: node.children[0].loc.start,
end: node.children[node.children.length - 1].loc.end
end: node.children[node.children.length - 1].loc.end,
source: ''
}
)
)