Chore: some minor changes

SukkaW · Dec 22, 2024 · 84e4f34 · 84e4f34
1 parent af04018
commit 84e4f34
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/Build/build-cdn-download-conf.ts b/Build/build-cdn-download-conf.ts
@@ -7,8 +7,9 @@ import { appendArrayInPlace } from './lib/append-array-in-place';
 import { SOURCE_DIR } from './constants/dir';
 import { DomainsetOutput } from './lib/create-file';
 import { CRASHLYTICS_WHITELIST } from './constants/reject-data-source';
+import { appendSetElementsToArray } from 'foxts/append-set-elements-to-array';
 
-const getS3OSSDomainsPromise = (async (): Promise<string[]> => {
+const getS3OSSDomainsPromise = (async (): Promise<Set<string>> => {
   const trie = new HostnameTrie();
 
   for await (const line of await fetchRemoteTextByLine('https://publicsuffix.org/list/public_suffix_list.dat', true)) {
@@ -44,7 +45,7 @@ const getS3OSSDomainsPromise = (async (): Promise<string[]> => {
     }
   });
 
-  return Array.from(S3OSSDomains);
+  return S3OSSDomains;
 })();
 
 export const buildCdnDownloadConf = task(require.main === module, __filename)(async (span) => {
@@ -62,7 +63,7 @@ export const buildCdnDownloadConf = task(require.main === module, __filename)(as
   ]);
 
   // Move S3 domains to download domain set, since S3 files may be large
-  appendArrayInPlace(downloadDomainSet, S3OSSDomains);
+  appendSetElementsToArray(downloadDomainSet, S3OSSDomains);
   appendArrayInPlace(downloadDomainSet, steamDomainSet);
 
   // we have whitelisted the crashlytics domain, and we also want to put it in CDN policy

diff --git a/Build/build-public.ts b/Build/build-public.ts
@@ -9,6 +9,7 @@ import type { TreeType, TreeTypeArray } from './lib/tree-dir';
 import { OUTPUT_MOCK_DIR, OUTPUT_MODULES_DIR, PUBLIC_DIR, ROOT_DIR } from './constants/dir';
 import { fastStringCompare, mkdirp, writeFile } from './lib/misc';
 import picocolors from 'picocolors';
+import { tagged as html } from 'foxts/tagged';
 import { compareAndWriteFile } from './lib/create-file';
 
 const mockDir = path.join(ROOT_DIR, 'Mock');
@@ -94,8 +95,6 @@ const priorityOrder: Record<'default' | string & {}, number> = {
 };
 const prioritySorter = (a: TreeType, b: TreeType) => ((priorityOrder[a.name] || priorityOrder.default) - (priorityOrder[b.name] || priorityOrder.default)) || fastStringCompare(a.name, b.name);
 
-const html = (string: TemplateStringsArray, ...values: any[]) => string.reduce((acc, str, i) => acc + str + (values[i] ?? ''), '');
-
 function walk(tree: TreeTypeArray) {
   let result = '';
   tree.sort(prioritySorter);

diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts
@@ -164,7 +164,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
           '! Description: The domainset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining',
           '!'
         ],
-        rejectOutput.adguardhome(/* filterRuleWhitelistDomainSets */)
+        rejectOutput.adguardhome()
       ),
       path.join(OUTPUT_INTERNAL_DIR, 'reject-adguardhome.txt')
     )

diff --git a/Build/lib/rules/ip.ts b/Build/lib/rules/ip.ts
@@ -22,7 +22,7 @@ export class IPListOutput extends RuleOutput<Preprocessed> {
     appendArrayInPlace(
       results,
       merge(
-        appendArrayInPlace(Array.from(this.ipcidrNoResolve), Array.from(this.ipcidr)),
+        appendSetElementsToArray(Array.from(this.ipcidrNoResolve), this.ipcidr),
         true
       )
     );

diff --git a/Build/lib/rules/ruleset.ts b/Build/lib/rules/ruleset.ts
@@ -61,15 +61,15 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
 
     appendArrayInPlace(
       results,
-      merge(Array.from(this.ipcidrNoResolve)).map(i => `IP-CIDR,${i},no-resolve`, true)
+      merge(Array.from(this.ipcidrNoResolve), true).map(i => `IP-CIDR,${i},no-resolve`)
     );
     appendSetElementsToArray(results, this.ipcidr6NoResolve, i => `IP-CIDR6,${i},no-resolve`);
     appendSetElementsToArray(results, this.ipasnNoResolve, i => `IP-ASN,${i},no-resolve`);
     appendSetElementsToArray(results, this.groipNoResolve, i => `GEOIP,${i},no-resolve`);
 
     appendArrayInPlace(
       results,
-      merge(Array.from(this.ipcidr)).map(i => `IP-CIDR,${i}`, true)
+      merge(Array.from(this.ipcidr), true).map(i => `IP-CIDR,${i}`)
     );
     appendSetElementsToArray(results, this.ipcidr6, i => `IP-CIDR6,${i}`);
     appendSetElementsToArray(results, this.ipasn, i => `IP-ASN,${i}`);
@@ -108,15 +108,15 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
 
     appendArrayInPlace(
       results,
-      merge(Array.from(this.ipcidrNoResolve)).map(i => `IP-CIDR,${i},no-resolve`, true)
+      merge(Array.from(this.ipcidrNoResolve), true).map(i => `IP-CIDR,${i},no-resolve`)
     );
     appendSetElementsToArray(results, this.ipcidr6NoResolve, i => `IP-CIDR6,${i},no-resolve`);
     appendSetElementsToArray(results, this.ipasnNoResolve, i => `IP-ASN,${i},no-resolve`);
     appendSetElementsToArray(results, this.groipNoResolve, i => `GEOIP,${i},no-resolve`);
 
     appendArrayInPlace(
       results,
-      merge(Array.from(this.ipcidr)).map(i => `IP-CIDR,${i}`, true)
+      merge(Array.from(this.ipcidr), true).map(i => `IP-CIDR,${i}`)
     );
     appendSetElementsToArray(results, this.ipcidr6, i => `IP-CIDR6,${i}`);
     appendSetElementsToArray(results, this.ipasn, i => `IP-ASN,${i}`);
@@ -130,7 +130,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
     appendArrayInPlace(
       ip_cidr,
       merge(
-        appendArrayInPlace(Array.from(this.ipcidrNoResolve), Array.from(this.ipcidr)),
+        appendSetElementsToArray(Array.from(this.ipcidrNoResolve), this.ipcidr),
         true
       )
     );
@@ -143,7 +143,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
         domain: appendArrayInPlace(['this_ruleset_is_made_by_sukkaw.ruleset.skk.moe'], this.$preprocessed[0]),
         domain_suffix: this.$preprocessed[1],
         domain_keyword: Array.from(this.domainKeywords),
-        domain_regex: Array.from(this.domainWildcard).map(RuleOutput.domainWildCardToRegex),
+        domain_regex: Array.from(this.domainWildcard, RuleOutput.domainWildCardToRegex),
         ip_cidr,
         source_ip_cidr: [...this.sourceIpOrCidr].reduce<string[]>((acc, cur) => {
           if (cur.includes('/')) {

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "fast-cidr-tools": "^0.3.1",
     "fast-fifo": "^1.3.2",
     "fdir": "^6.4.2",
-    "foxts": "^1.0.10",
+    "foxts": "^1.0.11",
     "hash-wasm": "^4.12.0",
     "json-stringify-pretty-compact": "^3.0.0",
     "make-fetch-happen": "^14.0.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml