Deno ts fix (porsager#328) fixes porsager#327

porsager · web-flow · commit 50403a1537c7 · 2022-04-20T23:12:12.000+02:00
diff --git a/deno/types/index.d.ts b/deno/types/index.d.ts
@@ -1,6 +1,7 @@
 import { Buffer } from 'https://deno.land/std@0.132.0/node/buffer.ts'
 import process from 'https://deno.land/std@0.132.0/node/process.ts'
 import { Readable, Writable } from 'https://deno.land/std@0.132.0/node/stream.ts'
+
 /**
  * Establish a connection to a PostgreSQL server.
  * @param options Connection options - default to the same as psql
@@ -433,12 +434,12 @@ declare namespace postgres {
     writable(options?: {
       highWaterMark?: number,
       start?: number
-    }): Promise<import('node:stream').Writable>;
+    }): Promise<Writable>;
     readable(options?: {
       highWaterMark?: number,
       start?: number,
       end?: number
-    }): Promise<import('node:stream').Readable>;
+    }): Promise<Readable>;
 
     close(): Promise<void>;
     tell(): Promise<void>;
@@ -518,8 +519,8 @@ declare namespace postgres {
   type RowList<T extends readonly any[]> = T & Iterable<NonNullable<T[number]>> & ResultQueryMeta<T['length'], keyof T[number]>;
 
   interface PendingQueryModifiers<TRow extends readonly any[]> {
-    readable(): import('node:stream').Readable;
-    writable(): import('node:stream').Writable;
+    readable(): Readable;
+    writable(): Writable;
 
     execute(): this;
     cancel(): void;
diff --git a/transpile.deno.js b/transpile.deno.js
@@ -58,10 +58,6 @@ function transpile(x, name, folder) {
       x += '\n;window.addEventListener("unload", () => Deno.exit(process.exitCode))'
   }
 
-  const stream = x.includes('import(\'node:stream\')')
-    ? 'import { Readable, Writable } from \'' + std + 'node/stream.ts\'\n'
-    : ''
-
   const buffer = x.includes('Buffer')
     ? 'import { Buffer } from \'' + std + 'node/buffer.ts\'\n'
     : ''
@@ -78,7 +74,7 @@ function transpile(x, name, folder) {
     ? 'import { HmacSha256 } from \'' + std + 'hash/sha256.ts\'\n'
     : ''
 
-  return hmac + buffer + process + stream + timers + x
+  return hmac + buffer + process + timers + x
     .replace(
       'crypto.createHmac(\'sha256\', key).update(x).digest()',
       'Buffer.from(new HmacSha256(key).update(x).digest())'
@@ -88,7 +84,8 @@ function transpile(x, name, folder) {
       '(query.writable.push({ chunk }), callback())'
     )
     .replace(/.setKeepAlive\([^)]+\)/g, '')
-    .replace(/import net from 'net'/, 'import { net } from \'../polyfills.js\'')
-    .replace(/import tls from 'tls'/, 'import { tls } from \'../polyfills.js\'')
+    .replace('node:stream', std + 'node/stream.ts')
+    .replace('import net from \'net\'', 'import { net } from \'../polyfills.js\'')
+    .replace('import tls from \'tls\'', 'import { tls } from \'../polyfills.js\'')
     .replace(/ from '([a-z_]+)'/g, ' from \'' + std + 'node/$1.ts\'')
 }
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,3 +1,5 @@
+import { Readable, Writable } from 'node:stream'
+
 /**
  * Establish a connection to a PostgreSQL server.
  * @param options Connection options - default to the same as psql
@@ -430,12 +432,12 @@ declare namespace postgres {
     writable(options?: {
       highWaterMark?: number,
       start?: number
-    }): Promise<import('node:stream').Writable>;
+    }): Promise<Writable>;
     readable(options?: {
       highWaterMark?: number,
       start?: number,
       end?: number
-    }): Promise<import('node:stream').Readable>;
+    }): Promise<Readable>;
 
     close(): Promise<void>;
     tell(): Promise<void>;
@@ -515,8 +517,8 @@ declare namespace postgres {
   type RowList<T extends readonly any[]> = T & Iterable<NonNullable<T[number]>> & ResultQueryMeta<T['length'], keyof T[number]>;
 
   interface PendingQueryModifiers<TRow extends readonly any[]> {
-    readable(): import('node:stream').Readable;
-    writable(): import('node:stream').Writable;
+    readable(): Readable;
+    writable(): Writable;
 
     execute(): this;
     cancel(): void;
