|
|
@@ -6,36 +6,20 @@ export const compare = (a: string, b: string) => {
|
|
|
|
|
|
const aLen = a.length;
|
|
|
const r = aLen - b.length;
|
|
|
- if (r > 0) {
|
|
|
- return 1;
|
|
|
- }
|
|
|
- if (r < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (let i = 0; i < aLen; i++) {
|
|
|
- // if (b[i] == null) {
|
|
|
- // return 1;
|
|
|
- // }
|
|
|
- if (a[i] < b[i]) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
- if (a[i] > b[i]) {
|
|
|
- return 1;
|
|
|
- }
|
|
|
- }
|
|
|
- return 0;
|
|
|
+ if (r !== 0) return r;
|
|
|
+
|
|
|
+ return a.localeCompare(b);
|
|
|
};
|
|
|
|
|
|
const tldtsOpt = { allowPrivateDomains: false, detectIp: false, validateHostname: false };
|
|
|
|
|
|
export const sortDomains = (inputs: string[]) => {
|
|
|
- const domains = inputs.reduce<Map<string, string>>((acc, cur) => {
|
|
|
- if (!acc.has(cur)) {
|
|
|
+ const domains = inputs.reduce<Map<string, string>>((domains, cur) => {
|
|
|
+ if (!domains.has(cur)) {
|
|
|
const topD = tldts.getDomain(cur, tldtsOpt);
|
|
|
- acc.set(cur, topD ?? cur);
|
|
|
+ domains.set(cur, topD ?? cur);
|
|
|
};
|
|
|
- return acc;
|
|
|
+ return domains;
|
|
|
}, new Map());
|
|
|
|
|
|
const sorter = (a: string, b: string) => {
|
|
|
@@ -47,7 +31,7 @@ export const sortDomains = (inputs: string[]) => {
|
|
|
if (a === $a && b === $b) {
|
|
|
return compare(a, b);
|
|
|
}
|
|
|
- return compare($a, $b) || compare(a, b);
|
|
|
+ return $a.localeCompare($b) || compare(a, b);
|
|
|
};
|
|
|
|
|
|
sort(inputs, sorter);
|