Browse Source

Refactor: drop `Bun.inspect` and `Bun.version`

SukkaW 1 year ago
parent
commit
1f42c27afe
5 changed files with 21 additions and 11 deletions
  1. 10 0
      .swcrc
  2. 1 1
      Build/index.ts
  3. 7 8
      Build/lib/fetch-text-by-line.ts
  4. 1 1
      Build/lib/text-decoder-stream.ts
  5. 2 1
      Build/lib/trie.ts

+ 10 - 0
.swcrc

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://swc.rs/schema.json",
+  "jsc": {
+    "target": "esnext",
+    "parser": {
+      "syntax": "typescript",
+      "dynamicImport": true
+    }
+  }
+}

+ 1 - 1
Build/index.ts

@@ -1,4 +1,4 @@
-console.log('Bun version:', Bun.version, Bun.revision);
+console.log('Version:', process.version, typeof Bun !== 'undefined' ? Bun.revision : '');
 
 import { downloadPreviousBuild } from './download-previous-build';
 import { buildCommon } from './build-common';

+ 7 - 8
Build/lib/fetch-text-by-line.ts

@@ -69,13 +69,12 @@ export function fetchRemoteTextByLine(url: string | URL) {
   return fetchWithRetry(url, defaultRequestInit).then(createReadlineInterfaceFromResponse);
 }
 
-export async function readFileIntoProcessedArray(file: string | URL | BunFile) {
-  if (typeof file === 'string') {
-    file = Bun.file(file);
-  } else if (!('writer' in file)) {
-    file = Bun.file(file);
+export async function readFileIntoProcessedArray(file: string | BunFile | FileHandle) {
+  const results = [];
+  for await (const line of readFileByLine(file)) {
+    if (processLine(line)) {
+      results.push(line);
+    }
   }
-
-  const content = await file.text();
-  return content.split('\n').filter(processLine);
+  return results;
 }

+ 1 - 1
Build/lib/text-decoder-stream.ts

@@ -20,7 +20,7 @@ export class PolyfillTextDecoderStream extends TransformStream<Uint8Array, strin
   readonly ignoreBOM: boolean;
 
   constructor(
-    public readonly encoding: Bun.Encoding = 'utf-8',
+    public readonly encoding: BufferEncoding = 'utf-8',
     {
       fatal = false,
       ignoreBOM = false

+ 2 - 1
Build/lib/trie.ts

@@ -3,6 +3,7 @@
  */
 
 import { fastStringArrayJoin } from './misc';
+import { inspect } from 'util';
 
 // const { Error, Bun, JSON, Symbol } = globalThis;
 
@@ -403,7 +404,7 @@ export const createTrie = (from?: string[] | Set<string> | null, hostnameMode =
     },
     whitelist,
 
-    [Bun.inspect.custom]: (depth: number) => JSON.stringify(deepTrieNodeToJSON(root), null, 2).split('\n').map((line) => ' '.repeat(depth) + line).join('\n'),
+    [inspect.custom]: (depth: number) => JSON.stringify(deepTrieNodeToJSON(root), null, 2).split('\n').map((line) => ' '.repeat(depth) + line).join('\n'),
 
     hostnameMode,
     smolTree