feat: implement natural order comparison for duplicate exports and imports

Author: Rel1cx

packages/tsl-module/src/rules/no-duplicate-exports.ts

@@ -1,6 +1,8 @@
 import { type AST, defineRule } from "tsl";
 import ts from "typescript";
 
+import { naturalCompare } from "../utils";
+
 export const messages = {
   noDuplicateExports: (p: { source: string }) => `Duplicate export from module ${p.source}.`,
 } as const;
@@ -75,7 +77,7 @@ function buildSuggestions(a: ReExportDeclaration, b: ReExportDeclaration) {
       && ts.isNamedExports(b.exportClause): {
       const aElements = a.exportClause.elements.map((el) => el.getText());
       const bElements = b.exportClause.elements.map((el) => el.getText());
-      const parts = Array.from(new Set([...aElements, ...bElements])).sort();
+      const parts = Array.from(new Set([...aElements, ...bElements])).toSorted(naturalCompare);
       return [
         {
           message: "Merge duplicate exports",

packages/tsl-module/src/rules/no-duplicate-imports.test.ts

@@ -81,7 +81,7 @@ test("no-duplicate-import", () => {
               {
                 message: "Merge duplicate imports",
                 output: tsx`
-                  import foo, { type bar, baz, type qux, quux } from 'module';\n
+                  import foo, { baz, quux, type bar, type qux } from 'module';\n
                   import foo3, { corge } from 'module';
                 `,
               },
@@ -94,7 +94,7 @@ test("no-duplicate-import", () => {
               {
                 message: "Merge duplicate imports",
                 output: tsx`
-                  import foo, { type bar, baz, corge } from 'module';
+                  import foo, { baz, corge, type bar } from 'module';
                   import foo2, { type qux, quux } from 'module';\n
                 `,
               },

packages/tsl-module/src/rules/no-duplicate-imports.ts

@@ -2,6 +2,7 @@ import { unit } from "@let/eff";
 import { P, match } from "ts-pattern";
 import { type AST, defineRule } from "tsl";
 import ts from "typescript";
+import { naturalCompare } from "../utils";
 
 export const messages = {
   noDuplicateImports: (p: { source: string }) => `Duplicate import from module ${p.source}.`,
@@ -135,7 +136,8 @@ function buildMergedImport(a: ImportInfo, b: ImportInfo): string {
     parts.push(`* as ${b.namespaceImport}`);
   }
   // Named imports
-  const namedImports = Array.from(new Set([...a.namedImports, ...b.namedImports]));
+  const namedImports = Array.from(new Set([...a.namedImports, ...b.namedImports])).toSorted(naturalCompare);
+  // Construct named imports part
   if (namedImports.length > 0) {
     parts.push(`{ ${namedImports.join(", ")} }`);
   }

packages/tsl-module/src/utils/index.ts

@@ -0,0 +1 @@
+export * from "./string";

packages/tsl-module/src/utils/string.ts

@@ -0,0 +1,9 @@
+/**
+ * Compares two strings using natural order comparison.
+ * @param a The first string to compare.
+ * @param b The second string to compare.
+ * @returns A negative number if `a` comes before `b`, a positive number if `a` comes after `b`, or `0` if they are equivalent.
+ */
+export function naturalCompare(a: string, b: string): number {
+  return a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" });
+}