refactor: improves Join to handle - natively

Author: hugop95

rules/sort-modules.types.ts

@@ -1,6 +1,6 @@
 import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema'
 
-import type { WithDashSuffixOrEmpty, Join } from '../typings'
+import type { Join } from '../typings'
 
 import {
   buildCustomGroupModifiersJsonSchema,
@@ -94,56 +94,33 @@ type Group =
   | 'unknown'
   | string
 
+interface BaseSingleCustomGroup<T extends Selector> {
+  modifiers?: AllowedModifiersPerSelector[T][]
+  selector?: T
+}
+
 type NonDefaultClassGroup = Join<
-  [
-    ExportModifierPrefix,
-    DeclareModifierPrefix,
-    DecoratedModifierPrefix,
-    ClassSelector,
-  ]
+  [ExportModifier, DeclareModifier, DecoratedModifier, ClassSelector]
 >
 
 type DefaultFunctionGroup = Join<
-  [
-    ExportModifierPrefix,
-    DefaultModifierPrefix,
-    AsyncModifierPrefix,
-    FunctionSelector,
-  ]
+  [ExportModifier, DefaultModifier, AsyncModifier, FunctionSelector]
 >
 
 type DefaultClassGroup = Join<
-  [
-    ExportModifierPrefix,
-    DefaultModifierPrefix,
-    DecoratedModifierPrefix,
-    ClassSelector,
-  ]
+  [ExportModifier, DefaultModifier, DecoratedModifier, ClassSelector]
 >
 
-interface BaseSingleCustomGroup<T extends Selector> {
-  modifiers?: AllowedModifiersPerSelector[T][]
-  selector?: T
-}
-
 type NonDefaultInterfaceGroup = Join<
-  [ExportModifierPrefix, DeclareModifierPrefix, InterfaceSelector]
+  [ExportModifier, DeclareModifier, InterfaceSelector]
 >
 
 type NonDefaultFunctionGroup = Join<
-  [ExportModifierPrefix, DeclareModifierPrefix, FunctionSelector]
+  [ExportModifier, DeclareModifier, FunctionSelector]
 >
 
 type DefaultInterfaceGroup = Join<
-  [ExportModifierPrefix, DefaultModifierPrefix, InterfaceSelector]
->
-
-type TypeGroup = Join<
-  [ExportModifierPrefix, DeclareModifierPrefix, TypeSelector]
->
-
-type EnumGroup = Join<
-  [ExportModifierPrefix, DeclareModifierPrefix, EnumSelector]
+  [ExportModifier, DefaultModifier, InterfaceSelector]
 >
 
 interface DecoratorNamePatternFilterCustomGroup {
@@ -154,15 +131,9 @@ interface ElementNamePatternFilterCustomGroup {
   elementNamePattern?: string
 }
 
-type DecoratedModifierPrefix = WithDashSuffixOrEmpty<DecoratedModifier>
-
-type DeclareModifierPrefix = WithDashSuffixOrEmpty<DeclareModifier>
-
-type DefaultModifierPrefix = WithDashSuffixOrEmpty<DefaultModifier>
-
-type ExportModifierPrefix = WithDashSuffixOrEmpty<ExportModifier>
+type TypeGroup = Join<[ExportModifier, DeclareModifier, TypeSelector]>
 
-type AsyncModifierPrefix = WithDashSuffixOrEmpty<AsyncModifier>
+type EnumGroup = Join<[ExportModifier, DeclareModifier, EnumSelector]>
 
 type DecoratedModifier = 'decorated'
 

rules/sort-object-types.types.ts

@@ -1,6 +1,6 @@
 import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema'
 
-import type { WithDashSuffixOrEmpty, Join } from '../typings'
+import type { Join } from '../typings'
 
 import {
   buildCustomGroupModifiersJsonSchema,
@@ -75,27 +75,15 @@ type CustomGroup = (
     groupName: string
   }
 
-type MemberGroup = Join<
-  [
-    OptionalModifierPrefix,
-    RequiredModifierPrefix,
-    MultilineModifierPrefix,
-    MemberSelector,
-  ]
->
-
-type MethodGroup = Join<
+type IndexSignatureGroup = Join<
   [
-    OptionalModifierPrefix,
-    RequiredModifierPrefix,
-    MultilineModifierPrefix,
-    MethodSelector,
+    OptionalModifier,
+    RequiredModifier,
+    MultilineModifier,
+    IndexSignatureSelector,
   ]
 >
 
-type IndexSignatureGroup =
-  `${OptionalModifierPrefix | RequiredModifierPrefix}${MultilineModifierPrefix}${IndexSignatureSelector}`
-
 /**
  * Only used in code, so I don't know if it's worth maintaining this.
  */
@@ -108,31 +96,34 @@ type Group =
   | 'unknown'
   | string
 
-type PropertyGroup =
-  `${OptionalModifierPrefix | RequiredModifierPrefix}${MultilineModifierPrefix}${PropertySelector}`
-
 interface BaseSingleCustomGroup<T extends Selector> {
   modifiers?: AllowedModifiersPerSelector[T][]
   selector?: T
 }
 
+type PropertyGroup = Join<
+  [OptionalModifier, RequiredModifier, MultilineModifier, PropertySelector]
+>
+
+type MemberGroup = Join<
+  [OptionalModifier, RequiredModifier, MultilineModifier, MemberSelector]
+>
+
+type MethodGroup = Join<
+  [OptionalModifier, RequiredModifier, MultilineModifier, MethodSelector]
+>
+
 /**
  * @deprecated For {@link `MultilineModifier`}
  */
 type MultilineGroup = Join<
-  [OptionalModifierPrefix, RequiredModifierPrefix, MultilineSelector]
+  [OptionalModifier, RequiredModifier, MultilineSelector]
 >
 
 interface ElementNamePatternFilterCustomGroup {
   elementNamePattern?: string
 }
 
-type MultilineModifierPrefix = WithDashSuffixOrEmpty<MultilineModifier>
-
-type RequiredModifierPrefix = WithDashSuffixOrEmpty<RequiredModifier>
-
-type OptionalModifierPrefix = WithDashSuffixOrEmpty<OptionalModifier>
-
 type IndexSignatureSelector = 'index-signature'
 
 /**

typings/index.ts

@@ -1,3 +1,2 @@
-export type { WithDashSuffixOrEmpty } from './with-dash-suffix-or-empty'
 export type { SortingNode } from './sorting-node'
 export type { Join } from './join'

typings/join.ts

@@ -2,5 +2,9 @@ export type Join<T extends string[]> = T extends [
   infer First extends string,
   ...infer Rest extends string[],
 ]
-  ? `${First}${Join<Rest>}`
-  : ''
+  ? Rest extends []
+    ? `${First}`
+    : `${WithDashSuffixOrEmpty<First>}${Join<Rest>}`
+  : never
+
+type WithDashSuffixOrEmpty<T extends string> = `${T}-` | ''