vuejs
diff --git a/‎scripts/update-fixtures-ast.js
Lines changed: 5 additions & 5 deletions b/‎scripts/update-fixtures-ast.js
Lines changed: 5 additions & 5 deletions
diff --git a/‎scripts/update-fixtures-document-fragment.js
Lines changed: 6 additions & 5 deletions b/‎scripts/update-fixtures-document-fragment.js
Lines changed: 6 additions & 5 deletions
diff --git a/‎src/ast/traverse.ts
Lines changed: 2 additions & 1 deletion b/‎src/ast/traverse.ts
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/common/ast-utils.ts
Lines changed: 2 additions & 2 deletions b/‎src/common/ast-utils.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/common/eslint-scope.ts
Lines changed: 1 addition & 1 deletion b/‎src/common/eslint-scope.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/common/espree.ts
Lines changed: 1 addition & 1 deletion b/‎src/common/espree.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/common/fix-locations.ts
Lines changed: 2 additions & 2 deletions b/‎src/common/fix-locations.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/common/location-calculator.ts
Lines changed: 1 addition & 1 deletion b/‎src/common/location-calculator.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/external/token-store/index.ts
Lines changed: 1 addition & 1 deletion b/‎src/external/token-store/index.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/html/intermediate-tokenizer.ts
Lines changed: 1 addition & 1 deletion b/‎src/html/intermediate-tokenizer.ts
Lines changed: 1 addition & 1 deletion
@@ -102,11 +102,11 @@ for (const name of TARGETS) {
     const servicesPath = path.join(ROOT, `${name}/services.json`)
     const source = fs.readFileSync(sourcePath, "utf8")
     const parserOptions = optionsPath ? require(optionsPath) : {}
-    const options = Object.assign(
-        { filePath: sourcePath },
-        PARSER_OPTIONS,
-        parserOptions,
-    )
+    const options = {
+        filePath: sourcePath,
+        ...PARSER_OPTIONS,
+        ...parserOptions,
+    }
     // console.log("Start:", name)
     const actual = parser.parseForESLint(source, options)
     const tokenRanges = getAllTokens(actual.ast).map((t) =>
 
@@ -58,11 +58,12 @@ for (const name of TARGETS) {
         path.join(ROOT, `${name}/parser-options.js`),
     ].find((fp) => fs.existsSync(fp))
     const source = fs.readFileSync(sourcePath, "utf8")
-    const options = Object.assign(
-        { filePath: sourcePath },
-        PARSER_OPTIONS,
-        optionsPath ? require(optionsPath) : {},
-    )
+    const options = {
+        filePath: sourcePath,
+        ...PARSER_OPTIONS,
+        ...(optionsPath ? require(optionsPath) : {}),
+    }
+
     const result = parser.parseForESLint(source, options)
     const actual = result.services.getDocumentFragment()
 
 
@@ -27,6 +27,7 @@ export const KEYS = Evk.unionWith({
     VSlotScopeExpression: ["params"],
     VStartTag: ["attributes"],
     VText: [],
+    VGenericExpression: ["expression"],
 })
 
 /**
@@ -82,7 +83,7 @@ function traverse(node: Node, parent: Node | null, visitor: Visitor): void {
     visitor.enterNode(node, parent)
 
     const keys =
-        (visitor.visitorKeys || KEYS)[node.type] || getFallbackKeys(node)
+        (visitor.visitorKeys ?? KEYS)[node.type] ?? getFallbackKeys(node)
     for (i = 0; i < keys.length; ++i) {
         const child = (node as any)[keys[i]]
 
 
@@ -78,8 +78,8 @@ export function isLang(
  * @returns The `lang` attribute value.
  */
 export function getLang(element: VElement | undefined): string | null {
-    const langAttr = element && element.startTag.attributes.find(isLang)
-    const lang = langAttr && langAttr.value && langAttr.value.value
+    const langAttr = element?.startTag.attributes.find(isLang)
+    const lang = langAttr?.value?.value
     return lang || null
 }
 /**
 
@@ -12,7 +12,7 @@ let escopeCache: ESLintScope | null = null
  * Load the newest `eslint-scope` from the loaded ESLint or dependency.
  */
 export function getEslintScope(): ESLintScope {
-    return escopeCache || (escopeCache = getNewest())
+    return escopeCache ?? (escopeCache = getNewest())
 }
 
 /**
 
@@ -16,7 +16,7 @@ let espreeCache: Espree | null = null
  * Gets the espree that the given ecmaVersion can parse.
  */
 export function getEspree(): Espree {
-    return espreeCache || (espreeCache = getNewestEspree())
+    return espreeCache ?? (espreeCache = getNewestEspree())
 }
 
 export function getEcmaVersionIfUseEspree(
 
@@ -24,10 +24,10 @@ export function fixLocations(
 ): void {
     fixNodeLocations(result.ast, result.visitorKeys, locationCalculator)
 
-    for (const token of result.ast.tokens || []) {
+    for (const token of result.ast.tokens ?? []) {
         fixLocation(token, locationCalculator)
     }
-    for (const comment of result.ast.comments || []) {
+    for (const comment of result.ast.comments ?? []) {
         fixLocation(comment, locationCalculator)
     }
 }
 
@@ -62,7 +62,7 @@ export class LocationCalculatorForHtml
         super(ltOffsets)
         this.gapOffsets = gapOffsets
         this.ltOffsets = ltOffsets
-        this.baseOffset = baseOffset || 0
+        this.baseOffset = baseOffset ?? 0
         this.baseIndexOfGap =
             this.baseOffset === 0
                 ? 0
 
@@ -334,7 +334,7 @@ export default class TokenStore {
             )
             .getOneToken()
 
-        if (token && token.range[0] === offset) {
+        if (token?.range[0] === offset) {
             return token
         }
         return null
 
@@ -222,7 +222,7 @@ export class IntermediateTokenizer {
     private processComment(token: Token): IntermediateToken | null {
         this.comments.push(token)
 
-        if (this.currentToken != null && this.currentToken.type === "Text") {
+        if (this.currentToken?.type === "Text") {
             return this.commit()
         }
         return null
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ let escopeCache: ESLintScope \| null = null`
`12`	`12`	* Load the newest `eslint-scope` from the loaded ESLint or dependency.
`13`	`13`	`*/`
`14`	`14`	`export function getEslintScope(): ESLintScope {`
`15`		`- return escopeCache \|\| (escopeCache = getNewest())`
	`15`	`+ return escopeCache ?? (escopeCache = getNewest())`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ let espreeCache: Espree \| null = null`
`16`	`16`	`* Gets the espree that the given ecmaVersion can parse.`
`17`	`17`	`*/`
`18`	`18`	`export function getEspree(): Espree {`
`19`		`- return espreeCache \|\| (espreeCache = getNewestEspree())`
	`19`	`+ return espreeCache ?? (espreeCache = getNewestEspree())`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`export function getEcmaVersionIfUseEspree(`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ export function fixLocations(`
`24`	`24`	`): void {`
`25`	`25`	`fixNodeLocations(result.ast, result.visitorKeys, locationCalculator)`
`26`	`26`
`27`		`- for (const token of result.ast.tokens \|\| []) {`
	`27`	`+ for (const token of result.ast.tokens ?? []) {`
`28`	`28`	`fixLocation(token, locationCalculator)`
`29`	`29`	`}`
`30`		`- for (const comment of result.ast.comments \|\| []) {`
	`30`	`+ for (const comment of result.ast.comments ?? []) {`
`31`	`31`	`fixLocation(comment, locationCalculator)`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ export default class TokenStore {`
`334`	`334`	`)`
`335`	`335`	`.getOneToken()`
`336`	`336`
`337`		`- if (token && token.range[0] === offset) {`
	`337`	`+ if (token?.range[0] === offset) {`
`338`	`338`	`return token`
`339`	`339`	`}`
`340`	`340`	`return null`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ export class IntermediateTokenizer {`
`222`	`222`	`private processComment(token: Token): IntermediateToken \| null {`
`223`	`223`	`this.comments.push(token)`
`224`	`224`
`225`		`- if (this.currentToken != null && this.currentToken.type === "Text") {`
	`225`	`+ if (this.currentToken?.type === "Text") {`
`226`	`226`	`return this.commit()`
`227`	`227`	`}`
`228`	`228`	`return null`