fix: a few types

un-ts · Nov 20, 2024 · 5d6cd07 · 5d6cd07
1 parent 8342026
commit 5d6cd07
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 27 deletions.
diff --git a/src/rules/consistent-type-specifier-style.ts b/src/rules/consistent-type-specifier-style.ts
@@ -1,6 +1,6 @@
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 
-import { createRule } from '../utils'
+import { createRule, getValue } from '../utils'
 
 function isComma(token: TSESTree.Token): token is TSESTree.PunctuatorToken {
   return token.type === 'Punctuator' && token.value === ','
@@ -34,10 +34,11 @@ function getImportText(
   }
 
   const names = specifiers.map(s => {
-    if (s.imported.name === s.local.name) {
-      return s.imported.name
+    const importedName = getValue(s.imported)
+    if (importedName === s.local.name) {
+      return importedName
     }
-    return `${s.imported.name} as ${s.local.name}`
+    return `${importedName} as ${s.local.name}`
   })
   // insert a fresh top-level import
   return `import ${kind} {${names.join(', ')}} from ${sourceString};`

diff --git a/src/rules/no-default-export.ts b/src/rules/no-default-export.ts
@@ -1,4 +1,4 @@
-import { createRule } from '../utils'
+import { createRule, getValue } from '../utils'
 import sourceType from '../utils/source-type'
 
 export = createRule({
@@ -37,11 +37,7 @@ export = createRule({
 
       ExportNamedDeclaration(node) {
         for (const specifier of node.specifiers.filter(
-          specifier =>
-            (specifier.exported.name ||
-              ('value' in specifier.exported && specifier.exported.value)) ===
-            'default',
-        )) {
+          specifier => getValue(specifier.exported) === 'default')) {
           const { loc } = sourceCode.getFirstTokens(node)[1] || {}
           // @ts-expect-error - experimental parser type
           if (specifier.type === 'ExportDefaultSpecifier') {
@@ -55,7 +51,7 @@ export = createRule({
               node,
               messageId: 'noAliasDefault',
               data: {
-                local: specifier.local.name,
+                local: getValue(specifier.local),
               },
               loc,
             })

diff --git a/src/rules/no-deprecated.ts b/src/rules/no-deprecated.ts
@@ -2,7 +2,7 @@ import type { TSESTree } from '@typescript-eslint/utils'
 import type { Tag } from 'doctrine'
 
 import type { ModuleNamespace } from '../utils'
-import { ExportMap, createRule, declaredScope } from '../utils'
+import { ExportMap, createRule, declaredScope, getValue } from '../utils'
 
 function message(deprecation: Tag) {
   return {
@@ -93,7 +93,7 @@ export = createRule({
               }
 
               case 'ImportSpecifier': {
-                imported = im.imported.name
+                imported = getValue(im.imported)
                 local = im.local.name
                 break
               }

diff --git a/src/rules/no-named-export.ts b/src/rules/no-named-export.ts
@@ -1,4 +1,4 @@
-import { createRule } from '../utils'
+import { createRule, getValue } from '../utils'
 import sourceType from '../utils/source-type'
 
 export = createRule({
@@ -32,9 +32,7 @@ export = createRule({
         }
 
         const someNamed = node.specifiers.some(
-          specifier =>
-            (specifier.exported.name ||
-              ('value' in specifier.exported && specifier.exported.value)) !==
+          specifier => getValue(specifier.exported) !==
             'default',
         )
         if (someNamed) {

diff --git a/src/rules/no-rename-default.ts b/src/rules/no-rename-default.ts
@@ -8,7 +8,7 @@ import path from 'node:path'
 
 import type { TSESTree } from '@typescript-eslint/utils'
 
-import { createRule, ExportMap } from '../utils'
+import { createRule, ExportMap, getValue } from '../utils'
 import type { ModuleOptions } from '../utils'
 
 type Options = ModuleOptions & {
@@ -86,7 +86,7 @@ export = createRule<[Options?], MessageId>({
           return
         }
         case 'ExportSpecifier': {
-          return targetNode.local.name
+          return getValue(targetNode.local)
         }
         case 'FunctionDeclaration': {
           return targetNode.id?.name
@@ -171,7 +171,7 @@ export = createRule<[Options?], MessageId>({
         return
       }
 
-      if (node.imported.name !== 'default') {
+      if (getValue(node.imported) !== 'default') {
         return
       }
 
@@ -322,7 +322,7 @@ function getDefaultExportNode(
     }
     case 'ExportNamedDeclaration': {
       return defaultExportNode.specifiers.find(
-        specifier => specifier.exported.name === 'default',
+        specifier => getValue(specifier.exported) === 'default',
       )
     }
     default: {

diff --git a/src/rules/prefer-default-export.ts b/src/rules/prefer-default-export.ts
@@ -1,6 +1,6 @@
 import type { TSESTree } from '@typescript-eslint/utils'
 
-import { createRule } from '../utils'
+import { createRule, getValue } from '../utils'
 
 type Options = {
   target?: 'single' | 'any'
@@ -70,8 +70,7 @@ export = createRule<[Options?], MessageId>({
 
       ExportSpecifier(node) {
         if (
-          (node.exported.name ||
-            ('value' in node.exported && node.exported.value)) === 'default'
+          getValue(node.exported) === 'default'
         ) {
           hasDefaultExport = true
         } else {

diff --git a/src/utils/export-map.ts b/src/utils/export-map.ts
@@ -241,7 +241,7 @@ export class ExportMap {
       }
     }
 
-    function addNamespace(object: object, identifier: TSESTree.Identifier) {
+    function addNamespace(object: object, identifier: TSESTree.Identifier | TSESTree.StringLiteral) {
       const nsfn = getNamespace(getValue(identifier))
       if (nsfn) {
         Object.defineProperty(object, 'namespace', { get: nsfn })
@@ -308,7 +308,7 @@ export class ExportMap {
         // else falls through
         default: {
           if ('local' in s) {
-            local = s.local.name
+            local = getValue(s.local)
           } else {
             throw new Error('Unknown export specifier type')
           }
@@ -318,7 +318,7 @@ export class ExportMap {
 
       if ('exported' in s) {
         // todo: JSDoc
-        m.reexports.set(s.exported.name, {
+        m.reexports.set(getValue(s.exported), {
           local,
           getImport: () => resolveImport(nsource),
         })