chore: update Typescript version to 6

piquark6046 · piquark6046 · commit f529bed076db · 2026-04-01T16:30:36.000Z
diff --git a/builder/package.json b/builder/package.json
@@ -12,22 +12,22 @@
     "@types/node": "^24.12.0"
   },
   "devDependencies": {
-    "@adguard/agtree": "^4.0.1",
+    "@adguard/agtree": "^4.0.4",
     "@npmcli/package-json": "^7.0.5",
     "@types/npmcli__package-json": "^4.0.4",
     "@types/semver": "^7.7.1",
-    "@typescript-eslint/eslint-plugin": "^8.57.0",
-    "@typescript-eslint/parser": "^8.57.0",
+    "@typescript-eslint/eslint-plugin": "^8.58.0",
+    "@typescript-eslint/parser": "^8.58.0",
     "@typescriptprime/parsing": "^2.0.0",
     "@typescriptprime/securereq": "^1.2.0",
     "chokidar": "^5.0.0",
-    "esbuild": "^0.27.3",
-    "eslint": "^10.0.3",
+    "esbuild": "^0.27.4",
+    "eslint": "^10.1.0",
     "semver": "^7.7.4",
-    "tldts": "^7.0.25",
+    "tldts": "^7.0.27",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.0",
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.58.0",
     "zod": "^4.3.6"
   }
 }
diff --git a/builder/source/debug.ts b/builder/source/debug.ts
@@ -8,7 +8,7 @@ import { Build } from './build.js'
 import { SafeInitCwd } from './utils/safe-init-cwd.js'
 
 let ProjectRoot = SafeInitCwd({ Cwd: Process.cwd(), InitCwd: Process.env.INIT_CWD })
-const WatchingGlob = [];
+const WatchingGlob: string[] = [];
 ['builder/', 'userscript/', ''].forEach(Dir => {
   WatchingGlob.push(...Fs.globSync(`${ProjectRoot}/${Dir}source/**/*.ts`))
   WatchingGlob.push(...Fs.globSync(`${ProjectRoot}/${Dir}source/**/*.json`))
@@ -18,11 +18,13 @@ const Watcher = Chokidar.watch([...WatchingGlob], {
   ignored: '**/node_modules/**',
 })
 
-let BuildCooldownTimer: NodeJS.Timeout = null
+let BuildCooldownTimer: NodeJS.Timeout | null = null
 let ShouldPreventHTTPResponse = false
 let Version: number = 0
 Watcher.on('all', async (WatcherEvent, WatcherPath) => {
-  clearTimeout(BuildCooldownTimer)
+  if (BuildCooldownTimer) {
+    clearTimeout(BuildCooldownTimer)
+  }
   BuildCooldownTimer = setTimeout(async () => {
     console.log(`Detected file change (${WatcherEvent}):`, WatcherPath)
     ShouldPreventHTTPResponse = true
diff --git a/builder/source/references/filterslists/ADG.ts b/builder/source/references/filterslists/ADG.ts
@@ -14,9 +14,9 @@ export async function IndexAdShieldDomainsFromAG(): Promise<Set<string>> {
   let StartingLine = -1
   let EndingLine = -1
   for (const [Index, Filter] of AGTreeFiltersList.children.entries()) {
-    if (Filter.category === 'Comment' && typeof Filter.raws.text === 'string' && Filter.raws.text.includes(AGBaseFilterListAdShieldKeys.Starting)) {
+    if (Filter.category === 'Comment' && typeof Filter.raws?.text === 'string' && Filter.raws?.text.includes(AGBaseFilterListAdShieldKeys.Starting)) {
       StartingLine = Index
-    } else if (Filter.category === 'Comment' && typeof Filter.raws.text === 'string' && Filter.raws.text.includes(AGBaseFilterListAdShieldKeys.Ending)) {
+    } else if (Filter.category === 'Comment' && typeof Filter.raws?.text === 'string' && Filter.raws?.text.includes(AGBaseFilterListAdShieldKeys.Ending)) {
       EndingLine = Index
     } else if (StartingLine !== -1 && EndingLine !== -1) {
       break
@@ -33,8 +33,10 @@ export async function IndexAdShieldDomainsFromAG(): Promise<Set<string>> {
     } else if (Filter.category === 'Cosmetic' && Filter.type === 'JsInjectionRule') {
       Filter.domains.children.forEach(Domain => AdShieldDomains.add(Domain.value))
     } else if (Filter.category === 'Network' && Filter.type === 'NetworkRule' && typeof Filter.modifiers !== 'undefined' && Filter.modifiers.children.some(M => M.name.value === 'domain')) {
-      let DomainValue = Filter.modifiers.children.find(M => M.name.value === 'domain').value.value
-      DomainValue.split('|').forEach(Domain => AdShieldDomains.add(Domain))
+      const DomainModifier = Filter.modifiers.children.find(M => M.name.value === 'domain')
+      if (typeof DomainModifier?.value?.value === 'string') {
+        DomainModifier.value.value.split('|').forEach(Domain => AdShieldDomains.add(Domain))
+      }
     }
   }
 
diff --git a/builder/source/references/filterslists/uBO.ts b/builder/source/references/filterslists/uBO.ts
@@ -14,9 +14,9 @@ export async function IndexAdShieldDomainsFromUBO(): Promise<Set<string>> {
   let StartingLine = -1
   let EndingLine = -1
   for (const [Index, Filter] of AGTreeFiltersList.children.entries()) {
-    if (Filter.category === 'Comment' && typeof Filter.raws.text === 'string' && Filter.raws.text.includes(UBOFilterListAdShieldKeys.Starting)) {
+    if (Filter.category === 'Comment' && typeof Filter.raws?.text === 'string' && Filter.raws.text.includes(UBOFilterListAdShieldKeys.Starting)) {
       StartingLine = Index
-    } else if (Filter.category === 'Comment' && typeof Filter.raws.text === 'string' && Filter.raws.text.includes(UBOFilterListAdShieldKeys.Ending)) {
+    } else if (Filter.category === 'Comment' && typeof Filter.raws?.text === 'string' && Filter.raws.text.includes(UBOFilterListAdShieldKeys.Ending)) {
       EndingLine = Index
     } else if (StartingLine !== -1 && EndingLine !== -1) {
       break
@@ -33,8 +33,10 @@ export async function IndexAdShieldDomainsFromUBO(): Promise<Set<string>> {
     } else if (Filter.category === 'Cosmetic' && Filter.type === 'JsInjectionRule') {
       Filter.domains.children.forEach(Domain => AdShieldDomains.add(Domain.value))
     } else if (Filter.category === 'Network' && Filter.type === 'NetworkRule' && typeof Filter.modifiers !== 'undefined' && Filter.modifiers.children.some(M => M.name.value === 'domain')) {
-      let DomainValue = Filter.modifiers.children.find(M => M.name.value === 'domain').value.value
-      DomainValue.split('|').forEach(Domain => AdShieldDomains.add(Domain))
+      const DomainModifier = Filter.modifiers.children.find(M => M.name.value === 'domain')
+      if (typeof DomainModifier?.value?.value === 'string') {
+        DomainModifier.value.value.split('|').forEach(Domain => AdShieldDomains.add(Domain))
+      }
     }
   }
 
diff --git a/builder/source/references/iabsellers.ts b/builder/source/references/iabsellers.ts
@@ -5,8 +5,8 @@ import { HTTPSRequest } from '@typescriptprime/securereq'
 const IABSellersJsonURL = 'https://info.ad-shield.io/sellers.json'
 
 export async function FetchIABSellersJsonData(): Promise<string[]> {
-  const IABSellersJsonResponse: { StatusCode: number, Headers: Record<string, string | string[]>, Body: unknown } = await HTTPSRequest(new URL(IABSellersJsonURL), { ExpectedAs: 'JSON' })
-  let IABSellersJsonData =IABSellersJsonResponse.Body as {
+  const IABSellersJsonResponse = await HTTPSRequest(new URL(IABSellersJsonURL), { ExpectedAs: 'JSON' })
+  let IABSellersJsonData = IABSellersJsonResponse.Body as {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     sellers: Array<{
       // eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/builder/source/utils/http-server.ts b/builder/source/utils/http-server.ts
@@ -4,7 +4,7 @@ import * as Process from 'node:process'
 import * as Path from 'node:path'
 import { SafeInitCwd } from './safe-init-cwd.js'
 
-function IsLoopBack(IP: string) {
+function IsLoopBack(IP?: string) {
   return IP === '127.0.0.1' || IP === '::1' || IP === '::ffff:127.0.0.1'
 }
 
diff --git a/builder/tsconfig.json b/builder/tsconfig.json
@@ -3,5 +3,8 @@
   "include": [
     "source/**/*.ts",
     "test/**/*.ts"
-  ]
+  ],
+  "compilerOptions": {
+    "types": ["node"]
+  }
 }
diff --git a/package.json b/package.json
@@ -32,9 +32,9 @@
     "builder"
   ],
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.57.0",
-    "@typescript-eslint/parser": "^8.57.0",
-    "eslint": "^10.0.3",
-    "typescript-eslint": "^8.57.0"
+    "@typescript-eslint/eslint-plugin": "^8.58.0",
+    "@typescript-eslint/parser": "^8.58.0",
+    "eslint": "^10.1.0",
+    "typescript-eslint": "^8.58.0"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,7 +4,6 @@
     "target": "ES2024",
     "moduleResolution": "NodeNext",
     "removeComments": false,
-    "alwaysStrict": false,
     "skipLibCheck": true,
     "paths": {
       "@builder/*": ["./builder/source/*"],
diff --git a/userscript/package.json b/userscript/package.json
@@ -7,9 +7,12 @@
   },
   "devDependencies": {
     "@types/web": "^0.0.342",
-    "@typescript-eslint/eslint-plugin": "^8.57.0",
-    "@typescript-eslint/parser": "^8.57.0",
-    "eslint": "^10.0.3",
-    "typescript-eslint": "^8.57.0"
+    "@typescript-eslint/eslint-plugin": "^8.58.0",
+    "@typescript-eslint/parser": "^8.58.0",
+    "eslint": "^10.1.0",
+    "typescript-eslint": "^8.58.0"
+  },
+  "dependencies": {
+    "typescript": "^6.0.2"
   }
 }
diff --git a/userscript/source/as-weakmap.ts b/userscript/source/as-weakmap.ts
@@ -12,18 +12,24 @@ import * as Utils from './utils.js'
 import { OriginalRegExpTest } from './index.js'
 
 export function CheckDepthInASWeakMap(Args: [object, unknown]) {
-  if (typeof Args[0] !== 'object') {
-    return false
-  }
-  if (Utils.CountCommonStrings(['device', 'id', 'imp', 'regs', 'site', 'source'], Object.keys(Args[0])) < 5) {
+  const FirstArg = Args[0] as Record<string, unknown>
+  if (Utils.CountCommonStrings(['device', 'id', 'imp', 'regs', 'site', 'source'], Object.keys(FirstArg)) < 5) {
     return false
   }
 
-  let ASBannerFrameIdRegExp = /^[0-9]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+\/[a-z0-9-\(\)]+\/[a-zA-Z0-9_]+_slot[0-9]+_+/
-  let ASBannerFrameKey: string = Object.keys(Args[0]).find(Arg => typeof Args[0][Arg] === 'object' && Array.isArray(Args[0][Arg]) &&
-    Args[0][Arg].filter(SubArg => typeof SubArg === 'object' && Object.keys(SubArg).filter(InnerArg => {
-      return typeof InnerArg === 'string' && OriginalRegExpTest.call(ASBannerFrameIdRegExp, InnerArg) as boolean
-    })).length >= 1)
+  const ASBannerFrameIdRegExp = /^[0-9]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+\/[a-z0-9-\(\)]+\/[a-zA-Z0-9_]+_slot[0-9]+_+/
+  const ASBannerFrameKey = Object.keys(FirstArg).find(Arg => {
+    const Candidate = FirstArg[Arg]
+    if (!Array.isArray(Candidate)) {
+      return false
+    }
+    return Candidate.filter(SubArg => {
+      if (typeof SubArg !== 'object' || SubArg === null) {
+        return false
+      }
+      return Object.keys(SubArg).some(InnerArg => OriginalRegExpTest.call(ASBannerFrameIdRegExp, InnerArg) as boolean)
+    }).length >= 1
+  })
   if (typeof ASBannerFrameKey === 'undefined') {
     return false
   }
diff --git a/userscript/source/index.ts b/userscript/source/index.ts
@@ -30,7 +30,7 @@ export function RunTinyShieldUserscript(BrowserWindow: typeof window, Userscript
 
   BrowserWindow.Function.prototype.toString = new Proxy(BrowserWindow.Function.prototype.toString, {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    apply(Target: () => string, ThisArg: Function, Args: null) {
+    apply(Target: () => string, ThisArg: Function, Args: []) {
       if (ProtectedFunctionStrings.includes(ThisArg.name)) {
         return `function ${ThisArg.name}() { [native code] }`
       } else {
diff --git a/userscript/tsconfig.json b/userscript/tsconfig.json
@@ -4,6 +4,7 @@
     "source/**/*.ts"
   ],
   "compilerOptions": {
+    "rootDir": "./source",
     "outDir": "../dist/",
     "declaration": true,
     "skipLibCheck": true

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import * as Process from 'node:process'`
`4`	`4`	`import * as Path from 'node:path'`
`5`	`5`	`import { SafeInitCwd } from './safe-init-cwd.js'`
`6`	`6`
`7`		`-function IsLoopBack(IP: string) {`
	`7`	`+function IsLoopBack(IP?: string) {`
`8`	`8`	`return IP === '127.0.0.1' \|\| IP === '::1' \|\| IP === '::ffff:127.0.0.1'`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@`
`32`	`32`	`"builder"`
`33`	`33`	`],`
`34`	`34`	`"devDependencies": {`
`35`		`- "@typescript-eslint/eslint-plugin": "^8.57.0",`
`36`		`- "@typescript-eslint/parser": "^8.57.0",`
`37`		`- "eslint": "^10.0.3",`
`38`		`- "typescript-eslint": "^8.57.0"`
	`35`	`+ "@typescript-eslint/eslint-plugin": "^8.58.0",`
	`36`	`+ "@typescript-eslint/parser": "^8.58.0",`
	`37`	`+ "eslint": "^10.1.0",`
	`38`	`+ "typescript-eslint": "^8.58.0"`
`39`	`39`	`}`
`40`	`40`	`}`