GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
SukkaW
2025-03-20 09:16:47 +08:00
parent 9be66afce7
commit 56e2f0e93f
3 changed files with 9 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Build/lib/trie.ts
View File

@@ -238,11 +238,11 @@ abstract class Triebase<Meta = unknown> {
private walk(
onMatches: (suffix: string[], subdomain: boolean, meta: Meta) => void,
withSort = false,
initialNode = this.$root,
initialSuffix: string[] = [],
withSort = false
initialSuffix: string[] = []
) {
const bfsImpl = withSort ? Triebase.dfsWithSort : Triebase.dfs;
const dfsImpl = withSort ? Triebase.dfsWithSort : Triebase.dfs;
const nodeStack: Array<TrieNode<Meta>> = [];
nodeStack.push(initialNode);
@@ -255,7 +255,7 @@ abstract class Triebase<Meta = unknown> {
let r;
do {
r = bfsImpl(nodeStack, suffixStack);
r = dfsImpl(nodeStack, suffixStack);
node = r[0]!;
const suffix = r[1];
@@ -271,45 +271,6 @@ abstract class Triebase<Meta = unknown> {
return (a.length - b.length) || fastStringCompare(a, b);
}
private walkWithSort(
onMatches: (suffix: string[], subdomain: boolean, meta: Meta) => void,
initialNode = this.$root,
initialSuffix: string[] = []
) {
const nodeStack: Array<TrieNode<Meta>> = [];
nodeStack.push(initialNode);
// Resolving initial string (begin the start of the stack)
const suffixStack: string[][] = [];
suffixStack.push(initialSuffix);
let node: TrieNode<Meta> = initialNode;
let child: Map<string, TrieNode<Meta>> = node[2];
do {
node = nodeStack.pop()!;
const suffix = suffixStack.pop()!;
child = node[2];
if (child.size) {
const keys = Array.from(child.keys()).sort(Triebase.compare);
for (let i = 0, l = keys.length; i < l; i++) {
const key = keys[i];
const childNode = child.get(key)!;
// Pushing the child node to the stack for next iteration of DFS
nodeStack.push(childNode);
suffixStack.push([key, ...suffix]);
}
}
// If the node is a sentinel, we push the suffix to the results
if (getBit(node[0], START)) {
onMatches(suffix, getBit(node[0], INCLUDE_ALL_SUBDOMAIN), node[4]);
}
} while (nodeStack.length);
};
protected getSingleChildLeaf(tokens: string[]): FindSingleChildLeafResult<Meta> | null {
let toPrune: TrieNode | null = null;
let tokenToPrune: string | null = null;
@@ -371,6 +332,7 @@ abstract class Triebase<Meta = unknown> {
this.walk(
onMatches,
false,
res.node, // Performing DFS from prefix
inputTokens
);
@@ -421,11 +383,7 @@ abstract class Triebase<Meta = unknown> {
onSuffix(toASCII(fastStringArrayJoin(suffix, '.')), subdomain);
};
if (withSort) {
this.walkWithSort(handleSuffix);
} else {
this.walk(handleSuffix);
}
this.walk(handleSuffix, withSort);
}
public dump(onSuffix: (suffix: string) => void, withSort?: boolean): void;
@@ -443,11 +401,7 @@ abstract class Triebase<Meta = unknown> {
results.push(subdomain ? '.' + d : d);
};
if (withSort) {
this.walkWithSort(handleSuffix);
} else {
this.walk(handleSuffix);
}
this.walk(handleSuffix, withSort);
return results;
};
@@ -461,11 +415,7 @@ abstract class Triebase<Meta = unknown> {
? (_suffix: string[], _subdomain: boolean, meta: Meta) => onMeta(meta)
: (_suffix: string[], _subdomain: boolean, meta: Meta) => results.push(meta);
if (withSort) {
this.walkWithSort(handleMeta);
} else {
this.walk(handleMeta);
}
this.walk(handleMeta, withSort);
return results;
};
@@ -485,11 +435,7 @@ abstract class Triebase<Meta = unknown> {
results.push([subdomain ? '.' + d : d, meta]);
};
if (withSort) {
this.walkWithSort(handleSuffix);
} else {
this.walk(handleSuffix);
}
this.walk(handleSuffix, withSort);
return results;
};