Use deferred from std@v0.22.0 (#75)

* Use deferred from std@v0.22.0 and bump deno to 0.22.0

This also drops the permissions.env() default since this is
now async in Deno...

* Don't require --allow-env

Author: hayd

.travis.yml

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

connection_params.ts

@@ -1,25 +1,20 @@
 import { parseDsn } from "./utils.ts";
 
 function getPgEnv(): IConnectionParams {
-  // this is dummy env object, if program
-  // was run with --allow-env permission then
-  // it's filled with actual values
-  let pgEnv: IConnectionParams = {};
-
-  if (Deno.permissions().env) {
+  try {
     const env = Deno.env();
-
-    pgEnv = {
+    return {
       database: env.PGDATABASE,
       host: env.PGHOST,
       port: env.PGPORT,
       user: env.PGUSER,
       password: env.PGPASSWORD,
       application_name: env.PGAPPNAME
     };
+  } catch (e) {
+    // PermissionDenied (--allow-env not passed)
+    return {};
   }
-
-  return pgEnv;
 }
 
 function selectFrom(

deferred.ts

@@ -1,50 +1,15 @@
-export type Deferred<T = any, R = Error> = {
-  promise: Promise<T>;
-  resolve: (t?: T) => void;
-  reject: (r?: R) => void;
-  readonly handled: boolean;
-};
-
-export type DeferredItemCreator<T> = () => Promise<T>;
-
-/** Create deferred promise that can be resolved and rejected by outside */
-export function defer<T, R>(): Deferred<T> {
-  let handled = false,
-    resolve: (t?: T) => void | undefined,
-    reject: (r?: any) => void | undefined;
-
-  const promise = new Promise<T>((res, rej) => {
-    resolve = r => {
-      handled = true;
-      res(r);
-    };
-    reject = r => {
-      handled = true;
-      rej(r);
-    };
-  });
-
-  return {
-    promise,
-    resolve: resolve!,
-    reject: reject!,
-
-    get handled() {
-      return handled;
-    }
-  };
-}
+import { Deferred, deferred } from "./deps.ts";
 
 export class DeferredStack<T> {
   private _array: Array<T>;
-  private _queue: Array<Deferred>;
+  private _queue: Array<Deferred<T>>;
   private _maxSize: number;
   private _size: number;
 
   constructor(
     max?: number,
     ls?: Iterable<T>,
-    private _creator?: DeferredItemCreator<T>
+    private _creator?: () => Promise<T>
   ) {
     this._maxSize = max || 10;
     this._array = ls ? [...ls] : [];
@@ -59,9 +24,9 @@ export class DeferredStack<T> {
       this._size++;
       return await this._creator();
     }
-    const d = defer();
+    const d = deferred<T>();
     this._queue.push(d);
-    await d.promise;
+    await d;
     return this._array.pop()!;
   }
 

deps.ts

@@ -1,21 +1,26 @@
 export {
   BufReader,
   BufWriter
-} from "https://deno.land/std@v0.20.0/io/bufio.ts";
+} from "https://deno.land/std@v0.22.0/io/bufio.ts";
 
-export { copyBytes } from "https://deno.land/std@v0.20.0/io/util.ts";
+export { copyBytes } from "https://deno.land/std@v0.22.0/io/util.ts";
 
 export {
   assert,
   assertEquals,
   assertStrContains,
   assertThrowsAsync
-} from "https://deno.land/std@v0.20.0/testing/asserts.ts";
+} from "https://deno.land/std@v0.22.0/testing/asserts.ts";
 
 export {
   runTests,
   test,
   TestFunction
-} from "https://deno.land/std@v0.20.0/testing/mod.ts";
+} from "https://deno.land/std@v0.22.0/testing/mod.ts";
+
+export {
+  Deferred,
+  deferred
+} from "https://deno.land/std@v0.22.0/util/async.ts";
 
 export { Hash } from "https://deno.land/x/checksum@1.0.1/mod.ts";