refactor

Author: waynzh

Diff for: lib/rules/no-import-compiler-macros.js

@@ -8,7 +8,10 @@ const COMPILER_MACROS = new Set([
   'defineProps',
   'defineEmits',
   'defineExpose',
-  'withDefaults'
+  'withDefaults',
+  'defineModel',
+  'defineOptions',
+  'defineSlots'
 ])
 
 const VUE_MODULES = new Set(['@vue/runtime-core', '@vue/runtime-dom', 'vue'])
@@ -39,7 +42,7 @@ module.exports = {
     schema: [],
     messages: {
       noImportCompilerMacros:
-        "'{{name}}' is a compiler macro and no longer needs to be imported from '{{source}}'."
+        "'{{name}}' is a compiler macro and doesn't need to be imported."
     }
   },
   /**
@@ -53,40 +56,41 @@ module.exports = {
       ImportDeclaration(node) {
         if (node.specifiers.length === 0) return
 
-        if (VUE_MODULES.has(node.source.value)) {
-          for (const specifier of node.specifiers) {
-            if (
-              specifier.type === 'ImportSpecifier' &&
-              COMPILER_MACROS.has(specifier.imported.name)
-            ) {
-              context.report({
-                node: specifier,
-                messageId: 'noImportCompilerMacros',
-                data: {
-                  name: specifier.imported.name,
-                  source: node.source.value
-                },
-                fix: (fixer) => {
-                  const tokenAfter = sourceCode.getTokenAfter(specifier)
-                  const tokenBefore = sourceCode.getTokenBefore(specifier)
+        if (!VUE_MODULES.has(node.source.value)) return
 
-                  const hasCommaAfter = isComma(tokenAfter)
-                  const isFirstSpecifier = isLeftCurlyBrace(tokenBefore)
+        for (const specifier of node.specifiers) {
+          if (
+            specifier.type !== 'ImportSpecifier' ||
+            !COMPILER_MACROS.has(specifier.imported.name)
+          ) {
+            continue
+          }
+
+          context.report({
+            node: specifier,
+            messageId: 'noImportCompilerMacros',
+            data: {
+              name: specifier.imported.name
+            },
+            fix: (fixer) => {
+              const tokenAfter = sourceCode.getTokenAfter(specifier)
+              const tokenBefore = sourceCode.getTokenBefore(specifier)
 
-                  const codeStart = hasCommaAfter
-                    ? tokenBefore.range[1]
-                    : isFirstSpecifier
-                      ? specifier.range[0]
-                      : tokenBefore.range[0]
-                  const codeEnd = hasCommaAfter
-                    ? tokenAfter.range[1]
-                    : specifier.range[1]
+              const hasCommaAfter = isComma(tokenAfter)
+              const isFirstSpecifier = isLeftCurlyBrace(tokenBefore)
 
-                  return fixer.removeRange([codeStart, codeEnd])
-                }
-              })
+              const codeStart = hasCommaAfter
+                ? tokenBefore.range[1]
+                : isFirstSpecifier
+                  ? specifier.range[0]
+                  : tokenBefore.range[0]
+              const codeEnd = hasCommaAfter
+                ? tokenAfter.range[1]
+                : specifier.range[1]
+
+              return fixer.removeRange([codeStart, codeEnd])
             }
-          }
+          })
         }
       }
     }

Diff for: tests/lib/rules/no-import-compiler-macros.js

@@ -56,35 +56,31 @@ tester.run('no-import-compiler-macros', rule, {
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'defineProps',
-            source: 'vue'
+            name: 'defineProps'
           },
           line: 3,
           column: 26
         },
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'defineEmits',
-            source: '@vue/runtime-core'
+            name: 'defineEmits'
           },
           line: 4,
           column: 16
         },
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'withDefaults',
-            source: '@vue/runtime-core'
+            name: 'withDefaults'
           },
           line: 4,
           column: 34
         },
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'defineExpose',
-            source: '@vue/runtime-dom'
+            name: 'defineExpose'
           },
           line: 5,
           column: 16
@@ -107,22 +103,48 @@ tester.run('no-import-compiler-macros', rule, {
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'defineProps',
-            source: 'vue'
+            name: 'defineProps'
           },
           line: 3,
           column: 16
         },
         {
           messageId: 'noImportCompilerMacros',
           data: {
-            name: 'withDefaults',
-            source: 'vue'
+            name: 'withDefaults'
           },
           line: 3,
           column: 29
         }
       ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+      <script setup lang="ts">
+      import { ref as refFoo, defineProps as definePropsFoo, type computed } from '@vue/runtime-core'
+      </script>
+      `,
+      output: `
+      <script setup lang="ts">
+      import { ref as refFoo, type computed } from '@vue/runtime-core'
+      </script>
+      `,
+      languageOptions: {
+        parserOptions: {
+          parser: require.resolve('@typescript-eslint/parser')
+        }
+      },
+      errors: [
+        {
+          messageId: 'noImportCompilerMacros',
+          data: {
+            name: 'defineProps'
+          },
+          line: 3,
+          column: 31
+        }
+      ]
     }
   ]
 })