@borela-tech/eslint-config 2.1.2 → 2.2.1

package/src/rules/sortedImports/createFix/buildSortedCode.ts

@@ -2,10 +2,11 @@ import {formatNamedImport} from './formatNamedImport'
 import {importGroupOrder} from '../ImportGroupOrder'
 import type {CategorizedImport} from '../CategorizedImport'
 import type {ImportGroup} from '../ImportGroup'
+import type {TSESLint} from '@typescript-eslint/utils'
 
 export function buildSortedCode(
   grouped: Record<ImportGroup, CategorizedImport[]>,
-  sourceCode: {getText: (node?: unknown) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string[] {
   const sortedCode: string[] = []
 

package/src/rules/sortedImports/createFix/formatNamedImport.ts

@@ -1,11 +1,12 @@
 import {areSpecifiersSorted} from '../areSpecifiersSorted'
 import {getNamedSpecifiers} from '../getNamedSpecifiers'
 import {sortSpecifiersText} from '../sortSpecifiersText'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
+import type {TSESTree} from '@typescript-eslint/utils'
 
 export function formatNamedImport(
   declaration: TSESTree.ImportDeclaration,
-  sourceCode: {getText: (node?: unknown) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string {
   const specifiers = getNamedSpecifiers(declaration)
 

package/src/rules/sortedImports/createFix/getReplacementRange.ts

@@ -1,13 +1,13 @@
 import {findLastImportIndex} from './findLastImportIndex'
-import type {ReplacementRange} from '../../../lib/ReplacementRange'
+import type {ReplacementRange} from '@lib/ReplacementRange'
 import type {TSESTree} from '@typescript-eslint/types'
 
 export function getReplacementRange(
   programBody: TSESTree.ProgramStatement[],
 ): ReplacementRange {
   const lastIndex = findLastImportIndex(programBody)
-  const firstImport = programBody[0] as TSESTree.ImportDeclaration
-  const lastImport = programBody[lastIndex] as TSESTree.ImportDeclaration
+  const firstImport = programBody[0]
+  const lastImport = programBody[lastIndex]
   const start = firstImport.range![0]
   const end = lastImport.range![1]
   return {start, end}

package/src/rules/sortedImports/createFix/groupImportsByType.ts

@@ -6,6 +6,7 @@ export function groupImportsByType(
 ): Record<ImportGroup, CategorizedImport[]> {
   const grouped: Record<ImportGroup, CategorizedImport[]> = {
     'side-effect': [],
+    namespace: [],
     default: [],
     named: [],
     type: [],

package/src/rules/sortedImports/createFix/index.ts

@@ -2,17 +2,16 @@ import {buildSortedCode} from './buildSortedCode'
 import {categorizeImports} from '../categorizeImports'
 import {groupImportsByType} from './groupImportsByType'
 import {sortImportGroups} from './sortImportGroups'
-import type {Rule} from 'eslint'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
+import type {TSESTree} from '@typescript-eslint/utils'
 
 function createFixForGroup(
-  fixer: Rule.RuleFixer,
+  fixer: TSESLint.RuleFixer,
   importDeclarations: TSESTree.ImportDeclaration[],
-  sourceCode: {getText: (node?: unknown) => string},
-): Rule.Fix | null {
-  if (importDeclarations.length === 0) {
+  sourceCode: TSESLint.SourceCode,
+) {
+  if (importDeclarations.length === 0)
     return null
-  }
 
   const categorized = categorizeImports(importDeclarations)
   const grouped = groupImportsByType(categorized)
@@ -32,11 +31,11 @@ function createFixForGroup(
 }
 
 export function createFix(
-  fixer: Rule.RuleFixer,
+  fixer: TSESLint.RuleFixer,
   importGroups: TSESTree.ImportDeclaration[][],
-  sourceCode: {getText: (node?: unknown) => string},
-): Rule.Fix[] {
-  const fixes: Rule.Fix[] = []
+  sourceCode: TSESLint.SourceCode,
+): TSESLint.RuleFix[] {
+  const fixes: TSESLint.RuleFix[] = []
 
   for (const group of importGroups) {
     const fix = createFixForGroup(fixer, group, sourceCode)

package/src/rules/sortedImports/createFix/sortImportGroups.ts

@@ -1,4 +1,4 @@
-import {compare} from '../../../lib/compare'
+import {compare} from '@lib/compare'
 import type {CategorizedImport} from '../CategorizedImport'
 import type {ImportGroup} from '../ImportGroup'
 
@@ -6,6 +6,7 @@ export function sortImportGroups(
   grouped: Record<ImportGroup, CategorizedImport[]>,
 ): void {
   grouped['side-effect'].sort((a, b) => compare(a.sortKey, b.sortKey))
+  grouped['namespace'].sort((a, b) => compare(a.sortKey, b.sortKey))
   grouped['default'].sort((a, b) => compare(a.sortKey, b.sortKey))
   grouped['named'].sort((a, b) => compare(a.sortKey, b.sortKey))
   grouped['type'].sort((a, b) => compare(a.sortKey, b.sortKey))

package/src/rules/sortedImports/getSortKey.ts

@@ -7,11 +7,17 @@ export function getSortKey(declaration: TSESTree.ImportDeclaration): string {
   if (group === 'side-effect')
     return declaration.source.value
 
+  if (group === 'namespace') {
+    const namespaceSpecifier = declaration.specifiers.find(
+      s => s.type === 'ImportNamespaceSpecifier',
+    )
+    return `*${namespaceSpecifier?.local.name ?? ''}`
+  }
+
   if (group === 'default') {
     const defaultSpecifier = declaration.specifiers.find(
       s => s.type === 'ImportDefaultSpecifier',
-    ) as TSESTree.ImportDefaultSpecifier | undefined
-
+    )
     return defaultSpecifier?.local.name ?? ''
   }
 

package/src/rules/sortedImports/index.ts

@@ -5,14 +5,17 @@ import {checkSpecifiersSorting} from './checkSpecifiersSorting'
 import {createFix} from './createFix'
 import {getImportGroups} from './getImportGroups'
 import type {ImportError} from './ImportError'
-import type {Rule} from 'eslint'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
 
-export const sortedImports: Rule.RuleModule = {
+type MessageIds =
+  | 'sortedImports'
+  | 'sortedNames'
+  | 'wrongGroup'
+
+export const sortedImports: TSESLint.RuleModule<MessageIds, []> = {
   meta: {
     docs: {
       description: 'Enforce sorted imports alphabetically',
-      recommended: true,
     },
     fixable: 'code',
     messages: {
@@ -26,7 +29,7 @@ export const sortedImports: Rule.RuleModule = {
   create(context) {
     return {
       Program(node) {
-        const body = node.body as TSESTree.ProgramStatement[]
+        const body = node.body
         const importGroups = getImportGroups(body)
         if (importGroups.length === 0)
           return

package/src/rules/sortedImports/sortSpecifiersText.ts

@@ -1,10 +1,11 @@
-import {compare} from '../../lib/compare'
+import {compare} from '@lib/compare'
 import {getSpecifierName} from './getSpecifierName'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
+import type {TSESTree} from '@typescript-eslint/utils'
 
 export function sortSpecifiersText(
   specifiers: TSESTree.ImportSpecifier[],
-  sourceCode: {getText: (node: TSESTree.ImportSpecifier) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string {
   const sorted = [...specifiers].sort((a, b) => {
     const nameA = getSpecifierName(a)

package/src/rules/sortedReExports/CategorizedReExport.ts

@@ -1,8 +1,10 @@
-import {TSESTree} from '@typescript-eslint/types'
+import type {TSESTree} from '@typescript-eslint/types'
 
 interface NamedReExport {
   declaration: TSESTree.ExportNamedDeclaration
-  group: 're-export-named' | 're-export-type'
+  group:
+    | 're-export-named'
+    | 're-export-type'
   sortKey: string
 }
 
@@ -12,4 +14,13 @@ interface ReExportAll {
   sortKey: string
 }
 
-export type CategorizedReExport = NamedReExport | ReExportAll
+interface ReExportNamespace {
+  declaration: TSESTree.ExportAllDeclaration
+  group: 're-export-namespace'
+  sortKey: string
+}
+
+export type CategorizedReExport =
+  | NamedReExport
+  | ReExportAll
+  | ReExportNamespace

package/src/rules/sortedReExports/ReExportError.ts

@@ -1,6 +1,9 @@
-import type {ReExportDeclaration} from './ReExportDeclaration'
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
 
 export interface ReExportError {
   node: ReExportDeclaration
-  messageId: 'sortedReExports' | 'sortedNames' | 'wrongGroup'
+  messageId:
+    | 'sortedReExports'
+    | 'sortedNames'
+    | 'wrongGroup'
 }

package/src/rules/sortedReExports/ReExportGroup.ts

@@ -1,4 +1,5 @@
 export type ReExportGroup =
   | 're-export-all'
+  | 're-export-namespace'
   | 're-export-named'
   | 're-export-type'

package/src/rules/sortedReExports/ReExportGroupOrder.ts

@@ -1,7 +1,8 @@
-import {ReExportGroup} from './ReExportGroup'
+import type {ReExportGroup} from './ReExportGroup'
 
 export const reExportGroupOrder: ReExportGroup[] = [
   're-export-all',
+  're-export-namespace',
   're-export-named',
   're-export-type',
 ]

package/src/rules/sortedReExports/areSpecifiersSorted.ts

@@ -1,4 +1,4 @@
-import {compare} from '../../lib/compare'
+import {compare} from '@lib/compare'
 import {getSpecifierName} from './getSpecifierName'
 import type {TSESTree} from '@typescript-eslint/types'
 

package/src/rules/sortedReExports/categorizeReExport.ts

@@ -1,12 +1,16 @@
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
 import type {ReExportGroup} from './ReExportGroup'
-import type {TSESTree} from '@typescript-eslint/types'
 
 export function categorizeReExport(
-  declaration: TSESTree.ExportNamedDeclaration | TSESTree.ExportAllDeclaration,
+  declaration: ReExportDeclaration,
 ): ReExportGroup {
-  // Example: export * from 'module'
-  if (declaration.type === 'ExportAllDeclaration')
+  // Example: export * from 'module' or export * as ns from 'module'
+  if (declaration.type === 'ExportAllDeclaration') {
+    // Export * as ns from 'module' has an 'exported' property
+    if (declaration.exported)
+      return 're-export-namespace'
     return 're-export-all'
+  }
 
   // Example: export type {Type} from 'module'
   if (declaration.exportKind === 'type')

package/src/rules/sortedReExports/categorizeReExports.ts

@@ -1,7 +1,7 @@
 import {categorizeReExport} from './categorizeReExport'
 import {getSortKey} from './getSortKey'
-import {ReExportDeclaration} from './ReExportDeclaration'
 import type {CategorizedReExport} from './CategorizedReExport'
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
 
 export function categorizeReExports(declarations: ReExportDeclaration[]): CategorizedReExport[] {
   return declarations.map(declaration => {

package/src/rules/sortedReExports/checkAlphabeticalSorting.ts

@@ -1,4 +1,4 @@
-import {compare} from '../../lib/compare'
+import {compare} from '@lib/compare'
 import {reExportGroupOrder} from './ReExportGroupOrder'
 import type {CategorizedReExport} from './CategorizedReExport'
 import type {ReExportError} from './ReExportError'

package/src/rules/sortedReExports/createFix/buildSortedCode.ts

@@ -3,10 +3,11 @@ import {isNamedReExport} from '../isNamedReExport'
 import {reExportGroupOrder} from '../ReExportGroupOrder'
 import type {CategorizedReExport} from '../CategorizedReExport'
 import type {ReExportGroup} from '../ReExportGroup'
+import type {TSESLint} from '@typescript-eslint/utils'
 
 export function buildSortedCode(
   grouped: Record<ReExportGroup, CategorizedReExport[]>,
-  sourceCode: {getText: (node?: unknown) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string[] {
   const sortedCode: string[] = []
 

package/src/rules/sortedReExports/createFix/formatNamedReExport.ts

@@ -1,11 +1,12 @@
 import {areSpecifiersSorted} from '../areSpecifiersSorted'
 import {getNamedSpecifiers} from '../getNamedSpecifiers'
 import {sortSpecifiersText} from '../sortSpecifiersText'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
+import type {TSESTree} from '@typescript-eslint/utils'
 
 export function formatNamedReExport(
   declaration: TSESTree.ExportNamedDeclaration,
-  sourceCode: {getText: (node?: unknown) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string {
   const specifiers = getNamedSpecifiers(declaration)
 

package/src/rules/sortedReExports/createFix/getReplacementRange.ts

@@ -1,6 +1,6 @@
 import {findFirstExportIndex} from './findFirstExportIndex'
 import {findLastExportIndex} from './findLastExportIndex'
-import type {ReplacementRange} from '../../../lib/ReplacementRange'
+import type {ReplacementRange} from '@lib/ReplacementRange'
 import type {TSESTree} from '@typescript-eslint/types'
 
 export function getReplacementRange(

package/src/rules/sortedReExports/createFix/groupReExportsByType.ts

@@ -6,6 +6,7 @@ export function groupReExportsByType(
 ): Record<ReExportGroup, CategorizedReExport[]> {
   const grouped: Record<ReExportGroup, CategorizedReExport[]> = {
     're-export-all': [],
+    're-export-namespace': [],
     're-export-named': [],
     're-export-type': [],
   }

package/src/rules/sortedReExports/createFix/index.ts

@@ -1,18 +1,17 @@
 import {buildSortedCode} from './buildSortedCode'
 import {categorizeReExports} from '../categorizeReExports'
 import {groupReExportsByType} from './groupReExportsByType'
-import {ReExportDeclaration} from '../ReExportDeclaration'
 import {sortExportGroups} from './sortExportGroups'
-import type {Rule} from 'eslint'
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
+import type {TSESLint} from '@typescript-eslint/utils'
 
 function createFixForGroup(
-  fixer: Rule.RuleFixer,
+  fixer: TSESLint.RuleFixer,
   reExportDeclarations: ReExportDeclaration[],
-  sourceCode: {getText: (node?: unknown) => string},
-): Rule.Fix | null {
-  if (reExportDeclarations.length === 0) {
+  sourceCode: TSESLint.SourceCode,
+) {
+  if (reExportDeclarations.length === 0)
     return null
-  }
 
   const categorized = categorizeReExports(reExportDeclarations)
   const grouped = groupReExportsByType(categorized)
@@ -32,11 +31,11 @@ function createFixForGroup(
 }
 
 export function createFix(
-  fixer: Rule.RuleFixer,
+  fixer: TSESLint.RuleFixer,
   reExportGroups: ReExportDeclaration[][],
-  sourceCode: {getText: (node?: unknown) => string},
-): Rule.Fix[] {
-  const fixes: Rule.Fix[] = []
+  sourceCode: TSESLint.SourceCode,
+): TSESLint.RuleFix[] {
+  const fixes: TSESLint.RuleFix[] = []
 
   for (const group of reExportGroups) {
     const fix = createFixForGroup(fixer, group, sourceCode)

package/src/rules/sortedReExports/createFix/sortExportGroups.ts

@@ -1,4 +1,4 @@
-import {compare} from '../../../lib/compare'
+import {compare} from '@lib/compare'
 import type {CategorizedReExport} from '../CategorizedReExport'
 import type {ReExportGroup} from '../ReExportGroup'
 
@@ -6,6 +6,7 @@ export function sortExportGroups(
   grouped: Record<ReExportGroup, CategorizedReExport[]>,
 ): void {
   grouped['re-export-all'].sort((a, b) => compare(a.sortKey, b.sortKey))
+  grouped['re-export-namespace'].sort((a, b) => compare(a.sortKey, b.sortKey))
   grouped['re-export-named'].sort((a, b) => compare(a.sortKey, b.sortKey))
   grouped['re-export-type'].sort((a, b) => compare(a.sortKey, b.sortKey))
 }

package/src/rules/sortedReExports/getNamedSpecifiers.ts

@@ -5,5 +5,5 @@ export function getNamedSpecifiers(
 ): TSESTree.ExportSpecifier[] {
   return declaration.specifiers.filter(
     s => s.type === 'ExportSpecifier' && s.local.type === 'Identifier',
-  ) as TSESTree.ExportSpecifier[]
+  )
 }

package/src/rules/sortedReExports/getReExportGroups.ts

@@ -1,4 +1,4 @@
-import type {ReExportDeclaration} from './ReExportDeclaration'
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
 import type {TSESTree} from '@typescript-eslint/types'
 
 function isReExportDeclaration(

package/src/rules/sortedReExports/getSortKey.ts

@@ -1,10 +1,16 @@
-import type {TSESTree} from '@typescript-eslint/types'
+import {categorizeReExport} from './categorizeReExport'
+import type {ReExportDeclaration} from '@lib/ReExportDeclaration'
 
-export function getSortKey(
-  declaration: TSESTree.ExportNamedDeclaration | TSESTree.ExportAllDeclaration,
-): string {
-  if (declaration.type === 'ExportAllDeclaration')
+export function getSortKey(declaration: ReExportDeclaration): string {
+  const group = categorizeReExport(declaration)
+
+  if (declaration.type === 'ExportAllDeclaration') {
+    if (group === 're-export-namespace') {
+      if (declaration.exported?.type === 'Identifier')
+        return `*${declaration.exported.name}`
+    }
     return declaration.source.value
+  }
 
   const specifier = declaration.specifiers[0]
   if (!specifier)

package/src/rules/sortedReExports/index.ts

@@ -5,14 +5,17 @@ import {checkSpecifiersSorting} from './checkSpecifiersSorting'
 import {createFix} from './createFix'
 import {getReExportGroups} from './getReExportGroups'
 import type {ReExportError} from './ReExportError'
-import type {Rule} from 'eslint'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
 
-export const sortedReExports: Rule.RuleModule = {
+type MessageIds =
+  | 'sortedReExports'
+  | 'sortedNames'
+  | 'wrongGroup'
+
+export const sortedReExports: TSESLint.RuleModule<MessageIds, []> = {
   meta: {
     docs: {
       description: 'Enforce sorted exports alphabetically',
-      recommended: true,
     },
     fixable: 'code',
     messages: {
@@ -26,7 +29,7 @@ export const sortedReExports: Rule.RuleModule = {
   create(context) {
     return {
       Program(node) {
-        const body = node.body as TSESTree.ProgramStatement[]
+        const body = node.body
         const reExportGroups = getReExportGroups(body)
         if (reExportGroups.length === 0)
           return

package/src/rules/sortedReExports/isNamedReExport.ts

@@ -1,6 +1,6 @@
-import {CategorizedNamedReExport} from './CategorizedNamedReExport'
+import type {CategorizedNamedReExport} from './CategorizedNamedReExport'
 import type {CategorizedReExport} from './CategorizedReExport'
 
 export function isNamedReExport(x: CategorizedReExport): x is CategorizedNamedReExport {
-  return x.group !== 're-export-all'
+  return x.group !== 're-export-all' && x.group !== 're-export-namespace'
 }

package/src/rules/sortedReExports/sortSpecifiersText.ts

@@ -1,10 +1,11 @@
-import {compare} from '../../lib/compare'
+import {compare} from '@lib/compare'
 import {getSpecifierName} from './getSpecifierName'
-import type {TSESTree} from '@typescript-eslint/types'
+import type {TSESLint} from '@typescript-eslint/utils'
+import type {TSESTree} from '@typescript-eslint/utils'
 
 export function sortSpecifiersText(
   specifiers: TSESTree.ExportSpecifier[],
-  sourceCode: {getText: (node?: unknown) => string},
+  sourceCode: TSESLint.SourceCode,
 ): string {
   const sorted = [...specifiers].sort((a, b) => {
     const nameA = getSpecifierName(a)

package/tsdown.config.ts

@@ -0,0 +1,19 @@
+import path from 'path'
+import {defineConfig} from 'tsdown'
+
+export default defineConfig(options => {
+  return {
+    ...options,
+    clean: true,
+    dts: true,
+    entry: {
+      index: 'src/index.ts',
+    },
+    format: ['esm'],
+    splitting: false,
+    sourcemap: true,
+    alias: {
+      '@lib': path.resolve(process.cwd(), 'src/lib'),
+    },
+  }
+})

package/dist/index.d.ts

@@ -1,5 +0,0 @@
-import * as eslint_config from 'eslint/config';
-
-declare const CONFIG: eslint_config.Config[];
-
-export { CONFIG };