@juit/pgproxy-client 1.2.1 → 1.3.0

package/dist/provider.d.ts

@@ -1,5 +1,5 @@
 /** Describes the result of a query from a {@link PGProvider} */
-export interface PGConnectionResult {
+export interface PGProviderResult {
     /** The SQL command that generated this result (`SELECT`, `INSERT`, ...) */
     command: string;
     /** Number of rows affected by this query (e.g. added rows in `INSERT`) */
@@ -9,24 +9,28 @@ export interface PGConnectionResult {
     /** Result rows, as an array of unparsed `string` results from `libpq` */
     rows: (string | null)[][];
 }
-export interface PGConnection {
-    query(text: string, params?: (string | null)[]): Promise<PGConnectionResult>;
+export interface PGProviderConnection {
+    query(text: string, params?: (string | null)[]): Promise<PGProviderResult>;
 }
-export interface PGProviderConstructor<Connection extends PGConnection> {
+export interface PGProviderConstructor<Connection extends PGProviderConnection = PGProviderConnection> {
     new (url: URL): PGProvider<Connection>;
 }
-export interface PGProvider<Connection extends PGConnection> extends PGConnection {
+export interface PGProvider<Connection extends PGProviderConnection = PGProviderConnection> extends PGProviderConnection {
+    /** The URL used to create this provider, devoid of any credentials */
+    readonly url: Readonly<URL>;
     acquire(): Promise<Connection>;
     release(connection: Connection): Promise<void>;
     destroy(): Promise<void>;
 }
-export declare abstract class AbstractPGProvider<Connection extends PGConnection> implements PGProvider<Connection> {
+export declare abstract class AbstractPGProvider<Connection extends PGProviderConnection = PGProviderConnection> implements PGProvider<Connection> {
+    constructor(url: URL | string);
+    get url(): Readonly<URL>;
     abstract acquire(): Promise<Connection>;
-    abstract release(connection: PGConnection): Promise<void>;
-    query(text: string, params?: (string | null)[]): Promise<PGConnectionResult>;
+    abstract release(connection: PGProviderConnection): Promise<void>;
+    query(text: string, params?: (string | null)[]): Promise<PGProviderResult>;
     destroy(): Promise<void>;
 }
 /** Register a provider, associating it with the specified protocol */
-export declare function registerProvider(protocol: string, constructor: PGProviderConstructor<PGConnection>): void;
+export declare function registerProvider(protocol: string, constructor: PGProviderConstructor): void;
 /** Create a new {@link PGProvider} instance for the specified URL */
-export declare function createProvider(url: URL): PGProvider<PGConnection>;
+export declare function createProvider(url: URL): PGProvider;

package/dist/provider.mjs

@@ -1,6 +1,18 @@
 // provider.ts
 import { assert } from "./assert.mjs";
+var providerUrls = /* @__PURE__ */ new WeakMap();
 var AbstractPGProvider = class {
+  constructor(url) {
+    providerUrls.set(this, new URL(url));
+  }
+  get url() {
+    const url = providerUrls.get(this);
+    assert(url, "Internal error: missing provider URL");
+    const sanitizedUrl = new URL(url);
+    sanitizedUrl.username = "";
+    sanitizedUrl.password = "";
+    return sanitizedUrl;
+  }
   async query(text, params = []) {
     const connection = await this.acquire();
     try {

package/dist/provider.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/provider.ts"],
-  "mappings": ";AAAA,SAAS,cAAc;AAqChB,IAAe,qBAAf,MAC2B;AAAA,EAIhC,MAAM,MAAM,MAAc,SAA4B,CAAC,GAAgC;AACrF,UAAM,aAAa,MAAM,KAAK,QAAQ;AACtC,QAAI;AACF,aAAO,MAAM,WAAW,MAAM,MAAM,MAAM;AAAA,IAC5C,UAAE;AACA,YAAM,KAAK,QAAQ,UAAU;AAAA,IAC/B;AAAA,EACF;AAAA,EAEA,MAAM,UAAyB;AAAA,EAE/B;AACF;AAOA,IAAM,YAAY,oBAAI,IAAiD;AAGhE,SAAS,iBACZ,UACA,aACI;AACN,aAAW,GAAG,QAAQ;AACtB,SAAO,CAAE,UAAU,IAAI,QAAQ,GAAG,4BAA4B,QAAQ,yBAAyB;AAC/F,YAAU,IAAI,UAAU,WAAW;AACnC,YAAU,IAAI,UAAU,WAAW;AACrC;AAGO,SAAS,eAAe,KAAoC;AACjE,QAAM,WAAW,UAAU,IAAI,IAAI,QAAQ;AAC3C,SAAO,UAAU,0CAA0C,IAAI,QAAQ,MAAM;AAC7E,SAAO,IAAI,SAAS,GAAG;AACzB;",
+  "mappings": ";AAAA,SAAS,cAAc;AAyCvB,IAAM,eAAe,oBAAI,QAAiC;AAEnD,IAAe,qBAAf,MAC2B;AAAA,EAChC,YAAY,KAAmB;AAC7B,iBAAa,IAAI,MAAM,IAAI,IAAI,GAAG,CAAC;AAAA,EACrC;AAAA,EAEA,IAAI,MAAqB;AACvB,UAAM,MAAM,aAAa,IAAI,IAAI;AACjC,WAAO,KAAK,sCAAsC;AAClD,UAAM,eAAe,IAAI,IAAI,GAAG;AAChC,iBAAa,WAAW;AACxB,iBAAa,WAAW;AACxB,WAAO;AAAA,EACT;AAAA,EAKA,MAAM,MAAM,MAAc,SAA4B,CAAC,GAA8B;AACnF,UAAM,aAAa,MAAM,KAAK,QAAQ;AACtC,QAAI;AACF,aAAO,MAAM,WAAW,MAAM,MAAM,MAAM;AAAA,IAC5C,UAAE;AACA,YAAM,KAAK,QAAQ,UAAU;AAAA,IAC/B;AAAA,EACF;AAAA,EAEA,MAAM,UAAyB;AAAA,EAE/B;AACF;AAQA,IAAM,YAAY,oBAAI,IAAmC;AAGlD,SAAS,iBACZ,UACA,aACI;AACN,aAAW,GAAG,QAAQ;AACtB,SAAO,CAAE,UAAU,IAAI,QAAQ,GAAG,4BAA4B,QAAQ,yBAAyB;AAC/F,YAAU,IAAI,UAAU,WAAW;AACnC,YAAU,IAAI,UAAU,WAAW;AACrC;AAGO,SAAS,eAAe,KAAsB;AACnD,QAAM,WAAW,UAAU,IAAI,IAAI,QAAQ;AAC3C,SAAO,UAAU,0CAA0C,IAAI,QAAQ,MAAM;AAC7E,SAAO,IAAI,SAAS,GAAG;AACzB;",
   "names": []
 }

package/dist/result.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/result.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA2CO,IAAM,WAAgC,MAAM,aAGjB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,QAA4B,UAAoB;AAC1D,SAAK,WAAW,OAAO;AACvB,SAAK,UAAU,OAAO;AACtB,SAAK,SAAS,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,OAAO,EAAE,MAAM,IAAI,EAAE;AAElE,UAAM,WAAW,OAAO,KAAK;AAC7B,UAAM,WAAW,OAAO,OAAO;AAE/B,UAAM,UAAU,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,MAAO;AAAA,MACpD;AAAA,MAAM,SAAS,UAAU,GAAG;AAAA,IAC9B,CAAW;AAEX,UAAM,OAAO,KAAK,OAAO,IAAI,MAAM,QAAQ;AAC3C,UAAM,SAAS,KAAK,SAAS,IAAI,MAAM,QAAQ;AAE/C,aAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,YAAM,YAAY,OAAO,GAAG,IAAI,IAAI,MAAM,QAAQ;AAClD,YAAM,UAAU,KAAK,GAAG,IAAI,CAAC;AAE7B,eAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,cAAM,CAAE,MAAM,MAAO,IAAI,QAAQ,GAAG;AACpC,cAAM,QAAQ,OAAO,KAAK,GAAG,EAAG,GAAG;AACnC,kBAAU,GAAG,IAAI,QAAQ,IAAI,IAC3B,UAAU,OAAO,OACjB,UAAU,SAAY,OACtB,OAAO,KAAK;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA2CO,IAAM,WAAgC,MAAM,aAGjB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,QAA0B,UAAoB;AACxD,SAAK,WAAW,OAAO;AACvB,SAAK,UAAU,OAAO;AACtB,SAAK,SAAS,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,OAAO,EAAE,MAAM,IAAI,EAAE;AAElE,UAAM,WAAW,OAAO,KAAK;AAC7B,UAAM,WAAW,OAAO,OAAO;AAE/B,UAAM,UAAU,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,MAAO;AAAA,MACpD;AAAA,MAAM,SAAS,UAAU,GAAG;AAAA,IAC9B,CAAW;AAEX,UAAM,OAAO,KAAK,OAAO,IAAI,MAAM,QAAQ;AAC3C,UAAM,SAAS,KAAK,SAAS,IAAI,MAAM,QAAQ;AAE/C,aAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,YAAM,YAAY,OAAO,GAAG,IAAI,IAAI,MAAM,QAAQ;AAClD,YAAM,UAAU,KAAK,GAAG,IAAI,CAAC;AAE7B,eAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,cAAM,CAAE,MAAM,MAAO,IAAI,QAAQ,GAAG;AACpC,cAAM,QAAQ,OAAO,KAAK,GAAG,EAAG,GAAG;AACnC,kBAAU,GAAG,IAAI,QAAQ,IAAI,IAC3B,UAAU,OAAO,OACjB,UAAU,SAAY,OACtB,OAAO,KAAK;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/result.d.ts

@@ -1,5 +1,5 @@
 import type { Registry } from '@juit/pgproxy-types';
-import type { PGConnectionResult } from './provider';
+import type { PGProviderResult } from './provider';
 /** The result of a database query */
 export interface PGResult<Row extends Record<string, any> = Record<string, any>, Tuple extends readonly any[] = readonly any[]> {
     /** The SQL command that generated this result (`SELECT`, `INSERT`, ...) */
@@ -24,7 +24,7 @@ export interface PGResult<Row extends Record<string, any> = Record<string, any>,
 }
 /** Constructor for {@link (PGResult:interface)} instances */
 export interface PGResultConstructor {
-    new <Row extends Record<string, any> = Record<string, any>, Tuple extends readonly any[] = readonly any[]>(result: PGConnectionResult, registry: Registry): PGResult<Row, Tuple>;
+    new <Row extends Record<string, any> = Record<string, any>, Tuple extends readonly any[] = readonly any[]>(result: PGProviderResult, registry: Registry): PGResult<Row, Tuple>;
 }
 /** The result of a database query */
 export declare const PGResult: PGResultConstructor;

package/dist/result.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/result.ts"],
-  "mappings": ";AA2CO,IAAM,WAAgC,MAAM,aAGjB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,QAA4B,UAAoB;AAC1D,SAAK,WAAW,OAAO;AACvB,SAAK,UAAU,OAAO;AACtB,SAAK,SAAS,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,OAAO,EAAE,MAAM,IAAI,EAAE;AAElE,UAAM,WAAW,OAAO,KAAK;AAC7B,UAAM,WAAW,OAAO,OAAO;AAE/B,UAAM,UAAU,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,MAAO;AAAA,MACpD;AAAA,MAAM,SAAS,UAAU,GAAG;AAAA,IAC9B,CAAW;AAEX,UAAM,OAAO,KAAK,OAAO,IAAI,MAAM,QAAQ;AAC3C,UAAM,SAAS,KAAK,SAAS,IAAI,MAAM,QAAQ;AAE/C,aAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,YAAM,YAAY,OAAO,GAAG,IAAI,IAAI,MAAM,QAAQ;AAClD,YAAM,UAAU,KAAK,GAAG,IAAI,CAAC;AAE7B,eAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,cAAM,CAAE,MAAM,MAAO,IAAI,QAAQ,GAAG;AACpC,cAAM,QAAQ,OAAO,KAAK,GAAG,EAAG,GAAG;AACnC,kBAAU,GAAG,IAAI,QAAQ,IAAI,IAC3B,UAAU,OAAO,OACjB,UAAU,SAAY,OACtB,OAAO,KAAK;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": ";AA2CO,IAAM,WAAgC,MAAM,aAGjB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,QAA0B,UAAoB;AACxD,SAAK,WAAW,OAAO;AACvB,SAAK,UAAU,OAAO;AACtB,SAAK,SAAS,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,OAAO,EAAE,MAAM,IAAI,EAAE;AAElE,UAAM,WAAW,OAAO,KAAK;AAC7B,UAAM,WAAW,OAAO,OAAO;AAE/B,UAAM,UAAU,OAAO,OAAO,IAAI,CAAC,CAAE,MAAM,GAAI,MAAO;AAAA,MACpD;AAAA,MAAM,SAAS,UAAU,GAAG;AAAA,IAC9B,CAAW;AAEX,UAAM,OAAO,KAAK,OAAO,IAAI,MAAM,QAAQ;AAC3C,UAAM,SAAS,KAAK,SAAS,IAAI,MAAM,QAAQ;AAE/C,aAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,YAAM,YAAY,OAAO,GAAG,IAAI,IAAI,MAAM,QAAQ;AAClD,YAAM,UAAU,KAAK,GAAG,IAAI,CAAC;AAE7B,eAAS,MAAM,GAAG,MAAM,UAAU,OAAQ;AACxC,cAAM,CAAE,MAAM,MAAO,IAAI,QAAQ,GAAG;AACpC,cAAM,QAAQ,OAAO,KAAK,GAAG,EAAG,GAAG;AACnC,kBAAU,GAAG,IAAI,QAAQ,IAAI,IAC3B,UAAU,OAAO,OACjB,UAAU,SAAY,OACtB,OAAO,KAAK;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/sql.cjs

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // sql.ts
 var sql_exports = {};
 __export(sql_exports, {
-  SQL: () => SQL
+  SQL: () => SQL,
+  escape: () => escape
 });
 module.exports = __toCommonJS(sql_exports);
 function makeSQL(parts, params, query = "", start = 0) {
@@ -42,8 +43,12 @@ function makeSQL(parts, params, query = "", start = 0) {
 function SQL(strings, ...args) {
   return makeSQL(strings, args);
 }
+function escape(str) {
+  return `"${str.replaceAll('"', '""').trim()}"`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  SQL
+  SQL,
+  escape
 });
 //# sourceMappingURL=sql.cjs.map

package/dist/sql.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/sql.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA+CA,SAAS,QACL,OACA,QACA,QAAgB,IAChB,QAAgB,GACb;AACL,QAAM,CAAE,QAAQ,IAAI,GAAG,IAAK,IAAI;AAEhC,MAAI,MAAO,UAAS;AACpB,WAAS,KAAK,OAAO,CAAC,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK;AAEpE,QAAM,MAAM,CAAC,YAA+B,SAA8B;AACxE,WAAO,QAAQ,SAAS,CAAE,GAAG,QAAQ,GAAG,IAAK,GAAG,OAAO,OAAO,MAAM;AAAA,EACtE;AAEA,SAAO,OAAO,OAAO,KAAK;AAAA,IACxB,IAAI,QAAgB;AAClB,aAAO;AAAA,IACT;AAAA,IACA,IAAI,SAAyB;AAC3B,aAAO,CAAE,GAAG,MAAO;AAAA,IACrB;AAAA,EACF,CAAC;AACH;AAuCO,SAAS,IAAI,YAA+B,MAA2B;AAC5E,SAAO,QAAQ,SAAS,IAAI;AAC9B;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA+CA,SAAS,QACL,OACA,QACA,QAAgB,IAChB,QAAgB,GACb;AACL,QAAM,CAAE,QAAQ,IAAI,GAAG,IAAK,IAAI;AAEhC,MAAI,MAAO,UAAS;AACpB,WAAS,KAAK,OAAO,CAAC,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK;AAEpE,QAAM,MAAM,CAAC,YAA+B,SAA8B;AACxE,WAAO,QAAQ,SAAS,CAAE,GAAG,QAAQ,GAAG,IAAK,GAAG,OAAO,OAAO,MAAM;AAAA,EACtE;AAEA,SAAO,OAAO,OAAO,KAAK;AAAA,IACxB,IAAI,QAAgB;AAClB,aAAO;AAAA,IACT;AAAA,IACA,IAAI,SAAyB;AAC3B,aAAO,CAAE,GAAG,MAAO;AAAA,IACrB;AAAA,EACF,CAAC;AACH;AAuCO,SAAS,IAAI,YAA+B,MAA2B;AAC5E,SAAO,QAAQ,SAAS,IAAI;AAC9B;AAGO,SAAS,OAAO,KAAqB;AAC1C,SAAO,IAAI,IAAI,WAAW,KAAK,IAAI,EAAE,KAAK,CAAC;AAC7C;",
   "names": []
 }

package/dist/sql.d.ts

@@ -77,3 +77,5 @@ export interface SQL extends Required<PGQuery> {
  * space character.
  */
 export declare function SQL(strings: readonly string[], ...args: readonly any[]): SQL;
+/** Escape a PostgreSQL identifier (table, column, ... names) */
+export declare function escape(str: string): string;

package/dist/sql.mjs

@@ -18,7 +18,11 @@ function makeSQL(parts, params, query = "", start = 0) {
 function SQL(strings, ...args) {
   return makeSQL(strings, args);
 }
+function escape(str) {
+  return `"${str.replaceAll('"', '""').trim()}"`;
+}
 export {
-  SQL
+  SQL,
+  escape
 };
 //# sourceMappingURL=sql.mjs.map

package/dist/sql.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/sql.ts"],
-  "mappings": ";AA+CA,SAAS,QACL,OACA,QACA,QAAgB,IAChB,QAAgB,GACb;AACL,QAAM,CAAE,QAAQ,IAAI,GAAG,IAAK,IAAI;AAEhC,MAAI,MAAO,UAAS;AACpB,WAAS,KAAK,OAAO,CAAC,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK;AAEpE,QAAM,MAAM,CAAC,YAA+B,SAA8B;AACxE,WAAO,QAAQ,SAAS,CAAE,GAAG,QAAQ,GAAG,IAAK,GAAG,OAAO,OAAO,MAAM;AAAA,EACtE;AAEA,SAAO,OAAO,OAAO,KAAK;AAAA,IACxB,IAAI,QAAgB;AAClB,aAAO;AAAA,IACT;AAAA,IACA,IAAI,SAAyB;AAC3B,aAAO,CAAE,GAAG,MAAO;AAAA,IACrB;AAAA,EACF,CAAC;AACH;AAuCO,SAAS,IAAI,YAA+B,MAA2B;AAC5E,SAAO,QAAQ,SAAS,IAAI;AAC9B;",
+  "mappings": ";AA+CA,SAAS,QACL,OACA,QACA,QAAgB,IAChB,QAAgB,GACb;AACL,QAAM,CAAE,QAAQ,IAAI,GAAG,IAAK,IAAI;AAEhC,MAAI,MAAO,UAAS;AACpB,WAAS,KAAK,OAAO,CAAC,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK;AAEpE,QAAM,MAAM,CAAC,YAA+B,SAA8B;AACxE,WAAO,QAAQ,SAAS,CAAE,GAAG,QAAQ,GAAG,IAAK,GAAG,OAAO,OAAO,MAAM;AAAA,EACtE;AAEA,SAAO,OAAO,OAAO,KAAK;AAAA,IACxB,IAAI,QAAgB;AAClB,aAAO;AAAA,IACT;AAAA,IACA,IAAI,SAAyB;AAC3B,aAAO,CAAE,GAAG,MAAO;AAAA,IACrB;AAAA,EACF,CAAC;AACH;AAuCO,SAAS,IAAI,YAA+B,MAA2B;AAC5E,SAAO,QAAQ,SAAS,IAAI;AAC9B;AAGO,SAAS,OAAO,KAAqB;AAC1C,SAAO,IAAI,IAAI,WAAW,KAAK,IAAI,EAAE,KAAK,CAAC;AAC7C;",
   "names": []
 }

package/dist/websocket.cjs

@@ -24,6 +24,7 @@ __export(websocket_exports, {
 });
 module.exports = __toCommonJS(websocket_exports);
 var import_assert = require("./assert.cjs");
+var import_provider = require("./provider.cjs");
 var pgWebSocketReadyState = {
   CONNECTING: 0,
   OPEN: 1,
@@ -116,7 +117,7 @@ var WebSocketConnectionImpl = class {
     });
   }
 };
-var WebSocketProvider = class {
+var WebSocketProvider = class extends import_provider.AbstractPGProvider {
   _connections = /* @__PURE__ */ new Set();
   /**
    * Handle the initial connection of a WebSocket.

package/dist/websocket.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/websocket.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/websocket.d.ts

@@ -1,4 +1,5 @@
-import type { PGConnection, PGConnectionResult, PGProvider } from './provider';
+import { AbstractPGProvider } from './provider';
+import type { PGProvider, PGProviderConnection, PGProviderResult } from './provider';
 interface PGWebSocketCloseEvent {
     readonly code: number;
     readonly reason: string;
@@ -23,14 +24,14 @@ export interface PGWebSocket {
     close(code?: number, reason?: string): void;
 }
 /** A connection to the database backed by a `WebSocket` */
-export interface WebSocketConnection extends PGConnection {
+export interface WebSocketConnection extends PGProviderConnection {
     /** Close this connection and the underlying `WebSocket` */
     close(): void;
 }
 /** An abstract provider implementing `connect(...)` via WHATWG WebSockets */
-export declare abstract class WebSocketProvider implements PGProvider<WebSocketConnection> {
+export declare abstract class WebSocketProvider extends AbstractPGProvider implements PGProvider<WebSocketConnection> {
     private readonly _connections;
-    abstract query(text: string, params?: (string | null)[]): Promise<PGConnectionResult>;
+    abstract query(text: string, params?: (string | null)[]): Promise<PGProviderResult>;
     /** Return a unique request identifier to correlate responses */
     protected abstract _getUniqueRequestId(): string;
     /**

package/dist/websocket.mjs

@@ -1,5 +1,6 @@
 // websocket.ts
 import { assert } from "./assert.mjs";
+import { AbstractPGProvider } from "./provider.mjs";
 var pgWebSocketReadyState = {
   CONNECTING: 0,
   OPEN: 1,
@@ -92,7 +93,7 @@ var WebSocketConnectionImpl = class {
     });
   }
 };
-var WebSocketProvider = class {
+var WebSocketProvider = class extends AbstractPGProvider {
   _connections = /* @__PURE__ */ new Set();
   /**
    * Handle the initial connection of a WebSocket.

package/dist/websocket.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/websocket.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juit/pgproxy-client",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/juitnow/juit-pgproxy#readme",
   "dependencies": {
-    "@juit/pgproxy-types": "1.2.1"
+    "@juit/pgproxy-types": "1.3.0"
   },
   "directories": {
     "test": "test"

package/src/client.ts

@@ -4,7 +4,7 @@ import { assert } from './assert'
 import { createProvider } from './provider'
 import { PGResult } from './result'
 
-import type { PGConnection, PGProvider } from './provider'
+import type { PGProvider, PGProviderConnection } from './provider'
 
 function serializeParams(params: readonly any[]): (string | null)[] {
   if (params.length == 0) return []
@@ -20,6 +20,29 @@ function serializeParams(params: readonly any[]): (string | null)[] {
   return result
 }
 
+/**
+ * Options to create a `PGClient`
+ *
+ * As an alternative to using URLs, a `PGClient` can be instantiated with
+ * options passed in this object.
+ */
+export interface PGClientOptions {
+  /** The protocol used to connect to the database (defaults to "psql") */
+  readonly protocol?: string
+  /** The PostgreSQL database to connect to */
+  readonly database?: string
+  /** The user to authenticate as */
+  readonly username?: string
+  /** The password to use for authentication */
+  readonly password?: string
+  /** The host to connect to */
+  readonly host?: string
+  /** The port to connect to */
+  readonly port?: number
+  /** Any additional options to pass to the provider */
+  readonly parameters?: Record<string, string | number | boolean>
+}
+
 /** An interface representing a SQL query to a database */
 export interface PGQuery {
   /** The SQL query to execute optionally containing placeholders. */
@@ -55,7 +78,8 @@ export interface PGQueryable {
 
 /**
  * An interface for an object that can execute queries _and transactions_
- * on a database */
+ * on a database
+ */
 export interface PGTransactionable extends PGQueryable {
   /**
    * Start a transaction by issuing a `BEGIN` statement
@@ -70,14 +94,23 @@ export interface PGTransactionable extends PGQueryable {
   rollback(): Promise<void>
 }
 
+/**
+ * A connection to a database that can be asynchronously disposed of.
+ */
+export interface PGConnection extends PGTransactionable, AsyncDisposable {
+  /** Forcedly close the underlying connection to the database */
+  close(): Promise<void>
+}
 
 /** A consumer for a {@link PGTransactionable} connection */
 export type PGConsumer<T> = (connection: PGTransactionable) => T | PromiseLike<T>
 
 /** The PostgreSQL client */
-export interface PGClient extends PGQueryable {
+export interface PGClient extends PGQueryable, AsyncDisposable {
   /** The {@link @juit/pgproxy-types#Registry} used to parse results from PostgreSQL */
   readonly registry: Registry
+  /** The URL used to create this provider, devoid of any credentials */
+  readonly url: Readonly<URL>
 
   /**
    * Execute a _single_ query on the database.
@@ -109,6 +142,12 @@ export interface PGClient extends PGQueryable {
     Tuple extends readonly any[] = readonly any [],
   >(query: PGQuery): Promise<PGResult<Row, Tuple>>
 
+  /**
+   * Connect to the database and return an _async disposable_
+   * {@link PGConnection}.
+   */
+  connect(): Promise<PGConnection>
+
   /**
    * Connect to the database to execute a number of different queries.
    *
@@ -128,39 +167,77 @@ export interface PGClient extends PGQueryable {
 /** A constructor for {@link (PGClient:interface)} instances */
 export interface PGClientConstructor {
   new (url?: string | URL): PGClient
-  new (provider: PGProvider<PGConnection>): PGClient
+  new (provider: PGProvider): PGClient
+  new (options: PGClientOptions): PGClient
 }
 
 /**
  * The PostgreSQL client
- *
- * @constructor
  */
 export const PGClient: PGClientConstructor = class PGClientImpl implements PGClient {
-  readonly registry: Registry = new Registry()
-
-  private _provider: PGProvider<PGConnection>
+  private readonly _registry: Registry = new Registry()
+  private readonly _provider: PGProvider
 
   constructor(url?: string | URL)
-  constructor(provider: PGProvider<PGConnection>)
-  constructor(urlOrProvider?: string | URL | PGProvider<PGConnection>) {
-    urlOrProvider = urlOrProvider || ((globalThis as any)?.process?.env?.PGURL as string | undefined)
-    assert(urlOrProvider, 'No URL to connect to (PGURL environment variable missing?)')
-    if (typeof urlOrProvider === 'string') urlOrProvider = new URL(urlOrProvider, 'psql:///')
-    assert(urlOrProvider, 'Missing URL or provider for client')
-
-    if (urlOrProvider instanceof URL) {
-      if (!(urlOrProvider.username || urlOrProvider.password)) {
+  constructor(provider: PGProvider)
+  constructor(options: PGClientOptions)
+  constructor(arg?: string | URL | PGClientOptions | PGProvider) {
+    // If `arg` is falsy (empty strong or nullish), use the `PGURL` environment
+    arg = arg || ((globalThis as any)?.process?.env?.PGURL as string | undefined)
+    assert(arg, 'No URL to connect to (PGURL environment variable missing?)')
+
+    // If `arg` is a string, convert it to a URL (relative to `psql:///`)
+    if (typeof arg === 'string') arg = new URL(arg, 'psql:///')
+    assert(arg, 'Missing URL or provider for client')
+
+    // If `arg` is an URL, fill in username and password from environment
+    // variables (unless specified) and create a provider from it
+    if ('href' in arg) {
+      if (!(arg.username || arg.password)) {
         const username = ((globalThis as any)?.process?.env?.PGUSER as string | undefined) || ''
         const password = ((globalThis as any)?.process?.env?.PGPASSWORD as string | undefined) || ''
-        urlOrProvider.username = encodeURIComponent(username)
-        urlOrProvider.password = encodeURIComponent(password)
+        arg.username = encodeURIComponent(username)
+        arg.password = encodeURIComponent(password)
+      }
+      this._provider = createProvider(arg)
+
+    // If `arg` is a PGProvider _already_, then use it directly
+    } else if (('query' in arg) && ('acquire' in arg) && ('release' in arg)) {
+      this._provider = arg
+
+    // If `arg` is an object, convert it to a URL and create a provider from it
+    } else {
+      const {
+        protocol = 'psql',
+        database = '',
+        username = ((globalThis as any)?.process?.env?.PGUSER as string | undefined),
+        password = ((globalThis as any)?.process?.env?.PGPASSWORD as string | undefined),
+        host = 'localhost',
+        port,
+        parameters = {},
+      } = arg
+
+      const url = new URL(`${protocol}://`)
+      if (host) url.hostname = host
+      if (port) url.port = String(port)
+      if (username) url.username = encodeURIComponent(username)
+      if (password) url.password = encodeURIComponent(password)
+      url.pathname = `/${database}`
+
+      for (const [ key, value ] of Object.entries(parameters)) {
+        url.searchParams.set(key, String(value))
       }
+
+      this._provider = createProvider(url)
     }
+  }
 
-    this._provider = urlOrProvider instanceof URL ?
-      createProvider(urlOrProvider) :
-      urlOrProvider
+  get registry(): Registry {
+    return this._registry
+  }
+
+  get url(): Readonly<URL> {
+    return this._provider.url
   }
 
   async query<
@@ -173,7 +250,6 @@ export const PGClient: PGClientConstructor = class PGClientImpl implements PGCli
     Tuple extends readonly any[] = readonly any [],
   >(query: PGQuery): Promise<PGResult<Row, Tuple>>
 
-
   async query<
     Row extends Record<string, any> = Record<string, any>,
     Tuple extends readonly any[] = readonly any [],
@@ -181,52 +257,80 @@ export const PGClient: PGClientConstructor = class PGClientImpl implements PGCli
     const [ text, params = [] ] = typeof textOrQuery === 'string' ?
       [ textOrQuery, maybeParams ] : [ textOrQuery.query, textOrQuery.params ]
 
-
     const result = await this._provider.query(text, serializeParams(params))
-    return new PGResult<Row, Tuple>(result, this.registry)
+    return new PGResult<Row, Tuple>(result, this._registry)
   }
 
-  async connect<T>(consumer: PGConsumer<T>): Promise<T> {
+  async connect<T>(consumer?: PGConsumer<T>): Promise<T | PGConnection> {
     const connection = await this._provider.acquire()
-    let transaction = false
-
-    try {
-      const registry = this.registry
-
-      const consumable: PGTransactionable = {
-        async query<
-          Row extends Record<string, any> = Record<string, any>,
-          Tuple extends readonly any[] = readonly any [],
-        >(textOrQuery: string | PGQuery, maybeParams: readonly any[] = []): Promise<PGResult<Row, Tuple>> {
-          const [ text, params = [] ] = typeof textOrQuery === 'string' ?
-            [ textOrQuery, maybeParams ] : [ textOrQuery.query, textOrQuery.params ]
-
-          const result = await connection.query(text, serializeParams(params))
-          return new PGResult(result, registry)
-        },
-        async begin(): Promise<boolean> {
-          if (transaction) return false
-          await connection.query('BEGIN')
-          return transaction = true
-        },
-        async commit(): Promise<void> {
-          await connection.query('COMMIT')
-          transaction = false
-        },
-        async rollback(): Promise<void> {
-          await connection.query('ROLLBACK')
-          transaction = false
-        },
-      }
 
-      return await consumer(consumable)
-    } finally {
-      if (transaction) await connection.query('ROLLBACK')
-      await this._provider.release(connection)
+    if (! consumer) {
+      return new PGConnectionImpl(connection, this._provider, this._registry)
+    } else {
+      await using conn = new PGConnectionImpl(connection, this._provider, this._registry)
+      return await consumer(conn)
     }
   }
 
   async destroy(): Promise<void> {
     return await this._provider.destroy()
   }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.destroy()
+  }
+}
+
+/* ===== INTERNAL IMPLEMENTATIONS =========================================== */
+
+class PGConnectionImpl implements PGConnection {
+  private _transaction: boolean = false
+  private readonly _connection: PGProviderConnection
+  private readonly _provider: PGProvider
+  private readonly _registry: Registry
+
+  constructor(
+      connection: PGProviderConnection,
+      provider: PGProvider,
+      registry: Registry) {
+    this._connection = connection
+    this._provider = provider
+    this._registry = registry
+  }
+
+  async query<
+    Row extends Record<string, any> = Record<string, any>,
+    Tuple extends readonly any[] = readonly any [],
+  >(textOrQuery: string | PGQuery, maybeParams: readonly any[] = []): Promise<PGResult<Row, Tuple>> {
+    const [ text, params = [] ] = typeof textOrQuery === 'string' ?
+      [ textOrQuery, maybeParams ] : [ textOrQuery.query, textOrQuery.params ]
+
+    const result = await this._connection.query(text, serializeParams(params))
+    return new PGResult(result, this._registry)
+  }
+
+  async begin(): Promise<boolean> {
+    if (this._transaction) return false
+    await this._connection.query('BEGIN')
+    return this._transaction = true
+  }
+
+  async commit(): Promise<void> {
+    await this._connection.query('COMMIT')
+    this._transaction = false
+  }
+
+  async rollback(): Promise<void> {
+    await this._connection.query('ROLLBACK')
+    this._transaction = false
+  }
+
+  async close(): Promise<void> {
+    if (this._transaction) await this._connection.query('ROLLBACK')
+    await this._provider.release(this._connection)
+  }
+
+  [Symbol.asyncDispose](): Promise<void> {
+    return this.close()
+  }
 }