chore: bump Deno to v0.39.0 (#106)

Author: uki00a

.travis.yml

@@ -1,7 +1,7 @@
 language: generic
 
 install:
-  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v0.35.0
+  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v0.39.0
   - export PATH="$HOME/.deno/bin:$PATH"
 
 services:

connection.ts

@@ -36,13 +36,13 @@ import { ConnectionParams } from "./connection_params.ts";
 
 export enum Format {
   TEXT = 0,
-  BINARY = 1
+  BINARY = 1,
 }
 
 enum TransactionStatus {
   Idle = "I",
   IdleInTransaction = "T",
-  InFailedTransaction = "E"
+  InFailedTransaction = "E",
 }
 
 export class Message {
@@ -51,7 +51,7 @@ export class Message {
   constructor(
     public type: string,
     public byteCount: number,
-    public body: Uint8Array
+    public body: Uint8Array,
   ) {
     this.reader = new PacketReader(body);
   }
@@ -65,7 +65,7 @@ export class Column {
     public typeOid: number,
     public columnLength: number,
     public typeModifier: number,
-    public format: Format
+    public format: Format,
   ) {}
 }
 
@@ -111,7 +111,7 @@ export class Connection {
     // TODO: recognize other parameters
     (["user", "database", "application_name"] as Array<
       keyof ConnectionParams
-    >).forEach(function(key) {
+    >).forEach(function (key) {
       const val = connParams[key];
       writer.addCString(key).addCString(val);
     });
@@ -138,7 +138,7 @@ export class Connection {
     const { host, port } = this.connParams;
     this.conn = await Deno.connect({
       port: parseInt(port, 10),
-      hostname: host
+      hostname: host,
     });
 
     this.bufReader = new BufReader(this.conn);
@@ -230,7 +230,7 @@ export class Connection {
     const password = hashMd5Password(
       this.connParams.password,
       this.connParams.user,
-      salt
+      salt,
     );
     const buffer = this.packetWriter.addCString(password).flush(0x70);
 
@@ -253,7 +253,7 @@ export class Connection {
   private _processReadyForQuery(msg: Message) {
     const txStatus = msg.reader.readByte();
     this._transactionStatus = String.fromCharCode(
-      txStatus
+      txStatus,
     ) as TransactionStatus;
   }
 
@@ -262,7 +262,7 @@ export class Connection {
 
     if (msg.type !== "Z") {
       throw new Error(
-        `Unexpected message type: ${msg.type}, expected "Z" (ReadyForQuery)`
+        `Unexpected message type: ${msg.type}, expected "Z" (ReadyForQuery)`,
       );
     }
 
@@ -363,7 +363,7 @@ export class Connection {
     if (hasBinaryArgs) {
       this.packetWriter.addInt16(query.args.length);
 
-      query.args.forEach(arg => {
+      query.args.forEach((arg) => {
         this.packetWriter.addInt16(arg instanceof Uint8Array ? 1 : 0);
       });
     } else {
@@ -372,7 +372,7 @@ export class Connection {
 
     this.packetWriter.addInt16(query.args.length);
 
-    query.args.forEach(arg => {
+    query.args.forEach((arg) => {
       if (arg === null || typeof arg === "undefined") {
         this.packetWriter.addInt32(-1);
       } else if (arg instanceof Uint8Array) {
@@ -546,7 +546,7 @@ export class Connection {
         msg.reader.readInt32(), // dataTypeOid
         msg.reader.readInt16(), // column
         msg.reader.readInt32(), // typeModifier
-        msg.reader.readInt16() // format
+        msg.reader.readInt16(), // format
       );
       columns.push(column);
     }

connection_params.ts

@@ -9,7 +9,7 @@ function getPgEnv(): IConnectionParams {
       port: env.PGPORT,
       user: env.PGUSER,
       password: env.PGPASSWORD,
-      application_name: env.PGAPPNAME
+      application_name: env.PGAPPNAME,
     };
   } catch (e) {
     // PermissionDenied (--allow-env not passed)
@@ -19,7 +19,7 @@ function getPgEnv(): IConnectionParams {
 
 function selectFrom(
   sources: Array<IConnectionParams>,
-  key: keyof IConnectionParams
+  key: keyof IConnectionParams,
 ): string | undefined {
   for (const source of sources) {
     if (source[key]) {
@@ -32,15 +32,15 @@ function selectFrom(
 
 function selectFromWithDefault(
   sources: Array<IConnectionParams>,
-  key: keyof typeof DEFAULT_CONNECTION_PARAMS
+  key: keyof typeof DEFAULT_CONNECTION_PARAMS,
 ): string {
   return selectFrom(sources, key) || DEFAULT_CONNECTION_PARAMS[key];
 }
 
 const DEFAULT_CONNECTION_PARAMS = {
   host: "127.0.0.1",
   port: "5432",
-  application_name: "deno_postgres"
+  application_name: "deno_postgres",
 };
 
 export interface IConnectionParams {
@@ -83,35 +83,37 @@ export class ConnectionParams {
       config = dsn;
     }
 
-    let potentiallyNull: { [K in keyof IConnectionParams]?: string; } = {
+    let potentiallyNull: { [K in keyof IConnectionParams]?: string } = {
       database: selectFrom([config, pgEnv], "database"),
-      user: selectFrom([config, pgEnv], "user")
+      user: selectFrom([config, pgEnv], "user"),
     };
 
     this.host = selectFromWithDefault([config, pgEnv], "host");
     this.port = selectFromWithDefault([config, pgEnv], "port");
     this.application_name = selectFromWithDefault(
       [config, pgEnv],
-      "application_name"
+      "application_name",
     );
     this.password = selectFrom([config, pgEnv], "password");
 
     const missingParams: string[] = [];
 
-    (["database", "user"] as Array<keyof IConnectionParams>).forEach(param => {
-      if (potentiallyNull[param]) {
-        this[param] = potentiallyNull[param]!;
-      } else {
-        missingParams.push(param);
-      }
-    });
+    (["database", "user"] as Array<keyof IConnectionParams>).forEach(
+      (param) => {
+        if (potentiallyNull[param]) {
+          this[param] = potentiallyNull[param]!;
+        } else {
+          missingParams.push(param);
+        }
+      },
+    );
 
     if (missingParams.length) {
       throw new ConnectionParamsError(
         `Missing connection parameters: ${missingParams.join(
-          ", "
+          ", ",
         )}. Connection parameters can be read 
-        from environment only if Deno is run with env permission (deno run --allow-env)`
+        from environment only if Deno is run with env permission (deno run --allow-env)`,
       );
     }
   }

deferred.ts

@@ -9,7 +9,7 @@ export class DeferredStack<T> {
   constructor(
     max?: number,
     ls?: Iterable<T>,
-    private _creator?: () => Promise<T>
+    private _creator?: () => Promise<T>,
   ) {
     this._maxSize = max || 10;
     this._array = ls ? [...ls] : [];

deps.ts

@@ -1,13 +1,13 @@
 export {
   BufReader,
   BufWriter
-} from "https://deno.land/std@v0.35.0/io/bufio.ts";
+} from "https://deno.land/std@v0.39.0/io/bufio.ts";
 
-export { copyBytes } from "https://deno.land/std@v0.35.0/io/util.ts";
+export { copyBytes } from "https://deno.land/std@v0.39.0/io/util.ts";
 
 export {
   Deferred,
   deferred
-} from "https://deno.land/std@v0.35.0/util/async.ts";
+} from "https://deno.land/std@v0.39.0/util/async.ts";
 
-export { Hash } from "https://deno.land/x/checksum@1.0.1/mod.ts";
+export { Hash } from "https://deno.land/x/checksum@1.2.0/mod.ts";

encode.ts

@@ -73,7 +73,7 @@ function encodeArray(array: Array<unknown>): string {
 
 function encodeBytes(value: Uint8Array): string {
   let hex = Array.from(value)
-    .map(val => (val < 10 ? `0${val.toString(16)}` : val.toString(16)))
+    .map((val) => (val < 10 ? `0${val.toString(16)}` : val.toString(16)))
     .join("");
   return `\\x${hex}`;
 }

oid.ts

@@ -165,5 +165,5 @@ export const Oid = {
   regnamespace: 4089,
   _regnamespace: 4090,
   regrole: 4096,
-  _regrole: 4097
+  _regrole: 4097,
 };

pool.ts

@@ -15,7 +15,7 @@ export class Pool {
   constructor(
     connectionParams: IConnectionParams,
     maxSize: number,
-    lazy?: boolean
+    lazy?: boolean,
   ) {
     this._connectionParams = new ConnectionParams(connectionParams);
     this._maxSize = maxSize;
@@ -54,7 +54,7 @@ export class Pool {
     this._availableConnections = new DeferredStack(
       this._maxSize,
       this._connections,
-      this._createConnection.bind(this)
+      this._createConnection.bind(this),
     );
   }
 
@@ -89,8 +89,10 @@ export class Pool {
 
   async end(): Promise<void> {
     await this._ready;
-    const ending = this._connections.map(c => c.end());
-    await Promise.all(ending);
+    while (this.available > 0) {
+      const conn = await this._availableConnections.pop();
+      await conn.end();
+    }
   }
 
   // Support `using` module

query.ts

@@ -49,7 +49,7 @@ export class QueryResult {
   }
 
   rowsOfObjects() {
-    return this.rows.map(row => {
+    return this.rows.map((row) => {
       const rv: { [key: string]: any } = {};
       this.rowDescription.columns.forEach((column, index) => {
         rv[column.name] = row[index];

test_deps.ts

@@ -4,4 +4,4 @@ export {
   assertEquals,
   assertStrContains,
   assertThrowsAsync
-} from "https://deno.land/std@v0.35.0/testing/asserts.ts";
+} from "https://deno.land/std@v0.39.0/testing/asserts.ts";

tests/connection_params.ts

@@ -4,7 +4,7 @@ import { ConnectionParams } from "../connection_params.ts";
 
 test(async function dsnStyleParameters() {
   const p = new ConnectionParams(
-    "postgres://some_user@some_host:10101/deno_postgres"
+    "postgres://some_user@some_host:10101/deno_postgres",
   );
 
   assertEquals(p.database, "deno_postgres");
@@ -18,7 +18,7 @@ test(async function objectStyleParameters() {
     user: "some_user",
     host: "some_host",
     port: "10101",
-    database: "deno_postgres"
+    database: "deno_postgres",
   });
 
   assertEquals(p.database, "deno_postgres");
@@ -52,7 +52,7 @@ test(async function envParameters() {
 test(async function defaultParameters() {
   const p = new ConnectionParams({
     database: "deno_postgres",
-    user: "deno_postgres"
+    user: "deno_postgres",
   });
   assertEquals(p.database, "deno_postgres");
   assertEquals(p.user, "deno_postgres");
@@ -71,7 +71,7 @@ test(async function requiredParameters() {
     assertEquals(e.name, "ConnectionParamsError");
     assertStrContains(
       e.message,
-      "Missing connection parameters: database, user"
+      "Missing connection parameters: database, user",
     );
   }
   assertEquals(thrown, true);

tests/constants.ts

@@ -8,13 +8,13 @@ export const DEFAULT_SETUP = [
   `INSERT INTO timestamps(dt) VALUES('2019-02-10T10:30:40.005+04:30');`,
   "DROP TABLE IF EXISTS bytes;",
   "CREATE TABLE bytes(b bytea);",
-  "INSERT INTO bytes VALUES(E'foo\\\\000\\\\200\\\\\\\\\\\\377')"
+  "INSERT INTO bytes VALUES(E'foo\\\\000\\\\200\\\\\\\\\\\\377')",
 ];
 
 export const TEST_CONNECTION_PARAMS = {
   user: "test",
   password: "test",
   database: "deno_postgres",
   host: "127.0.0.1",
-  port: "5432"
+  port: "5432",
 };