refactor (#246)

Author: ota-meshi

scripts/update-fixtures-ast.js

@@ -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) =>

scripts/update-fixtures-document-fragment.js

@@ -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()
 

src/ast/traverse.ts

@@ -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]]
 

src/common/ast-utils.ts

@@ -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
 }
 /**

src/common/eslint-scope.ts

@@ -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())
 }
 
 /**

src/common/espree.ts

@@ -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(

src/common/fix-locations.ts

@@ -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)
     }
 }

src/common/location-calculator.ts

@@ -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

src/external/token-store/index.ts

@@ -334,7 +334,7 @@ export default class TokenStore {
             )
             .getOneToken()
 
-        if (token && token.range[0] === offset) {
+        if (token?.range[0] === offset) {
             return token
         }
         return null

src/html/intermediate-tokenizer.ts

@@ -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