@juit/pgproxy-utils 1.2.0 → 1.3.0

package/dist/database.cjs

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +20,47 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __using = (stack, value, async) => {
+  if (value != null) {
+    if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
+    var dispose, inner;
+    if (async) dispose = value[__knownSymbol("asyncDispose")];
+    if (dispose === void 0) {
+      dispose = value[__knownSymbol("dispose")];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") __typeError("Object not disposable");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    stack.push([async, dispose, value]);
+  } else if (async) {
+    stack.push([async]);
+  }
+  return value;
+};
+var __callDispose = (stack, error, hasError) => {
+  var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
+    return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
+  };
+  var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
+  var next = (it) => {
+    while (it = stack.pop()) {
+      try {
+        var result = it[1] && it[1].call(it[2]);
+        if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
+      } catch (e) {
+        fail(e);
+      }
+    }
+    if (hasError) throw error;
+  };
+  return next();
+};
 
 // database.ts
 var database_exports = {};
@@ -25,7 +70,7 @@ __export(database_exports, {
   testdb: () => testdb
 });
 module.exports = __toCommonJS(database_exports);
-var import_pgproxy_persister = require("@juit/pgproxy-persister");
+var import_pgproxy_client = require("@juit/pgproxy-client");
 var import_plug = require("@plugjs/plug");
 var NAME_EXPR = /^[-\w]{4,}$/;
 function testdb(prefix = "test") {
@@ -34,19 +79,33 @@ function testdb(prefix = "test") {
   return `${prefix}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[^\d]/g, "")}-${random}`;
 }
 async function createdb(name = testdb(), url = "psql:///postgres") {
-  if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
-  import_plug.log.notice(`Creating database ${(0, import_plug.$ylw)(name)}`);
-  const persister = new import_pgproxy_persister.Persister(url);
-  await persister.query(`CREATE DATABASE ${(0, import_pgproxy_persister.escape)(name)}`);
-  await persister.destroy();
-  return name;
+  var _stack = [];
+  try {
+    if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
+    import_plug.log.notice(`Creating database ${(0, import_plug.$ylw)(name)}`);
+    const client = __using(_stack, new import_pgproxy_client.PGClient(url), true);
+    await client.query(`CREATE DATABASE ${(0, import_pgproxy_client.escape)(name)}`);
+    return name;
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
+  }
 }
 async function dropdb(name, url = "psql:///postgres") {
-  if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
-  import_plug.log.notice(`Dropping database ${(0, import_plug.$ylw)(name)}`);
-  const persister = new import_pgproxy_persister.Persister(url);
-  await persister.query(`DROP DATABASE IF EXISTS ${(0, import_pgproxy_persister.escape)(name)}`);
-  await persister.destroy();
+  var _stack = [];
+  try {
+    if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
+    import_plug.log.notice(`Dropping database ${(0, import_plug.$ylw)(name)}`);
+    const client = __using(_stack, new import_pgproxy_client.PGClient(url), true);
+    await client.query(`DROP DATABASE IF EXISTS ${(0, import_pgproxy_client.escape)(name)}`);
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/database.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/database.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,+BAAkC;AAClC,kBAA0B;AAE1B,IAAM,YAAY;AAGX,SAAS,OAAO,SAAS,QAAgB;AAC9C,MAAI,CAAE,UAAU,KAAK,MAAM,EAAG,OAAM,IAAI,MAAM,iCAAiC,MAAM,GAAG;AACxF,QAAM,SAAS,OAAO,KAAK,MAAM,KAAK,OAAO,IAAI,GAAK,CAAC,EAAE,SAAS,GAAG,GAAG;AACxE,SAAO,GAAG,MAAM,KAAI,oBAAI,KAAK,GAAE,YAAY,EAAE,QAAQ,UAAU,EAAE,CAAC,IAAI,MAAM;AAC9E;AASA,eAAsB,SAClB,OAAO,OAAO,GACd,MAAoB,oBACL;AACjB,MAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,kBAAI,OAAO,yBAAqB,kBAAK,IAAI,CAAC,EAAE;AAE5C,QAAM,YAAY,IAAI,mCAAU,GAAG;AACnC,QAAM,UAAU,MAAM,uBAAmB,iCAAO,IAAI,CAAC,EAAE;AACvD,QAAM,UAAU,QAAQ;AACxB,SAAO;AACT;AAOA,eAAsB,OAClB,MACA,MAAoB,oBACP;AACf,MAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,kBAAI,OAAO,yBAAqB,kBAAK,IAAI,CAAC,EAAE;AAE5C,QAAM,YAAY,IAAI,mCAAU,GAAG;AACnC,QAAM,UAAU,MAAM,+BAA2B,iCAAO,IAAI,CAAC,EAAE;AAC/D,QAAM,UAAU,QAAQ;AAC1B;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AACjC,kBAA0B;AAE1B,IAAM,YAAY;AAGX,SAAS,OAAO,SAAS,QAAgB;AAC9C,MAAI,CAAE,UAAU,KAAK,MAAM,EAAG,OAAM,IAAI,MAAM,iCAAiC,MAAM,GAAG;AACxF,QAAM,SAAS,OAAO,KAAK,MAAM,KAAK,OAAO,IAAI,GAAK,CAAC,EAAE,SAAS,GAAG,GAAG;AACxE,SAAO,GAAG,MAAM,KAAI,oBAAI,KAAK,GAAE,YAAY,EAAE,QAAQ,UAAU,EAAE,CAAC,IAAI,MAAM;AAC9E;AASA,eAAsB,SAClB,OAAO,OAAO,GACd,MAAoB,oBACL;AAIjB;AAAA;AAHA,QAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,oBAAI,OAAO,yBAAqB,kBAAK,IAAI,CAAC,EAAE;AAE5C,UAAY,SAAS,oBAAI,+BAAS,GAAG,GAAhB;AACrB,UAAM,OAAO,MAAM,uBAAmB,8BAAO,IAAI,CAAC,EAAE;AACpD,WAAO;AAAA,WAFP;AAAA;AAAA;AAAA;AAAA;AAAA;AAGF;AAOA,eAAsB,OAClB,MACA,MAAoB,oBACP;AAIf;AAAA;AAHA,QAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,oBAAI,OAAO,yBAAqB,kBAAK,IAAI,CAAC,EAAE;AAE5C,UAAY,SAAS,oBAAI,+BAAS,GAAG,GAAhB;AACrB,UAAM,OAAO,MAAM,+BAA2B,8BAAO,IAAI,CAAC,EAAE;AAAA,WAD5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAEF;",
   "names": []
 }

package/dist/database.mjs

@@ -1,5 +1,51 @@
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __using = (stack, value, async) => {
+  if (value != null) {
+    if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
+    var dispose, inner;
+    if (async) dispose = value[__knownSymbol("asyncDispose")];
+    if (dispose === void 0) {
+      dispose = value[__knownSymbol("dispose")];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") __typeError("Object not disposable");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    stack.push([async, dispose, value]);
+  } else if (async) {
+    stack.push([async]);
+  }
+  return value;
+};
+var __callDispose = (stack, error, hasError) => {
+  var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
+    return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
+  };
+  var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
+  var next = (it) => {
+    while (it = stack.pop()) {
+      try {
+        var result = it[1] && it[1].call(it[2]);
+        if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
+      } catch (e) {
+        fail(e);
+      }
+    }
+    if (hasError) throw error;
+  };
+  return next();
+};
+
 // database.ts
-import { Persister, escape } from "@juit/pgproxy-persister";
+import { PGClient, escape } from "@juit/pgproxy-client";
 import { $ylw, log } from "@plugjs/plug";
 var NAME_EXPR = /^[-\w]{4,}$/;
 function testdb(prefix = "test") {
@@ -8,19 +54,33 @@ function testdb(prefix = "test") {
   return `${prefix}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[^\d]/g, "")}-${random}`;
 }
 async function createdb(name = testdb(), url = "psql:///postgres") {
-  if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
-  log.notice(`Creating database ${$ylw(name)}`);
-  const persister = new Persister(url);
-  await persister.query(`CREATE DATABASE ${escape(name)}`);
-  await persister.destroy();
-  return name;
+  var _stack = [];
+  try {
+    if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
+    log.notice(`Creating database ${$ylw(name)}`);
+    const client = __using(_stack, new PGClient(url), true);
+    await client.query(`CREATE DATABASE ${escape(name)}`);
+    return name;
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
+  }
 }
 async function dropdb(name, url = "psql:///postgres") {
-  if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
-  log.notice(`Dropping database ${$ylw(name)}`);
-  const persister = new Persister(url);
-  await persister.query(`DROP DATABASE IF EXISTS ${escape(name)}`);
-  await persister.destroy();
+  var _stack = [];
+  try {
+    if (!NAME_EXPR.test(name)) throw new Error(`Invalid database name "${name}"`);
+    log.notice(`Dropping database ${$ylw(name)}`);
+    const client = __using(_stack, new PGClient(url), true);
+    await client.query(`DROP DATABASE IF EXISTS ${escape(name)}`);
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
+  }
 }
 export {
   createdb,

package/dist/database.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/database.ts"],
-  "mappings": ";AAAA,SAAS,WAAW,cAAc;AAClC,SAAS,MAAM,WAAW;AAE1B,IAAM,YAAY;AAGX,SAAS,OAAO,SAAS,QAAgB;AAC9C,MAAI,CAAE,UAAU,KAAK,MAAM,EAAG,OAAM,IAAI,MAAM,iCAAiC,MAAM,GAAG;AACxF,QAAM,SAAS,OAAO,KAAK,MAAM,KAAK,OAAO,IAAI,GAAK,CAAC,EAAE,SAAS,GAAG,GAAG;AACxE,SAAO,GAAG,MAAM,KAAI,oBAAI,KAAK,GAAE,YAAY,EAAE,QAAQ,UAAU,EAAE,CAAC,IAAI,MAAM;AAC9E;AASA,eAAsB,SAClB,OAAO,OAAO,GACd,MAAoB,oBACL;AACjB,MAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,MAAI,OAAO,qBAAqB,KAAK,IAAI,CAAC,EAAE;AAE5C,QAAM,YAAY,IAAI,UAAU,GAAG;AACnC,QAAM,UAAU,MAAM,mBAAmB,OAAO,IAAI,CAAC,EAAE;AACvD,QAAM,UAAU,QAAQ;AACxB,SAAO;AACT;AAOA,eAAsB,OAClB,MACA,MAAoB,oBACP;AACf,MAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,MAAI,OAAO,qBAAqB,KAAK,IAAI,CAAC,EAAE;AAE5C,QAAM,YAAY,IAAI,UAAU,GAAG;AACnC,QAAM,UAAU,MAAM,2BAA2B,OAAO,IAAI,CAAC,EAAE;AAC/D,QAAM,UAAU,QAAQ;AAC1B;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,UAAU,cAAc;AACjC,SAAS,MAAM,WAAW;AAE1B,IAAM,YAAY;AAGX,SAAS,OAAO,SAAS,QAAgB;AAC9C,MAAI,CAAE,UAAU,KAAK,MAAM,EAAG,OAAM,IAAI,MAAM,iCAAiC,MAAM,GAAG;AACxF,QAAM,SAAS,OAAO,KAAK,MAAM,KAAK,OAAO,IAAI,GAAK,CAAC,EAAE,SAAS,GAAG,GAAG;AACxE,SAAO,GAAG,MAAM,KAAI,oBAAI,KAAK,GAAE,YAAY,EAAE,QAAQ,UAAU,EAAE,CAAC,IAAI,MAAM;AAC9E;AASA,eAAsB,SAClB,OAAO,OAAO,GACd,MAAoB,oBACL;AAIjB;AAAA;AAHA,QAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,QAAI,OAAO,qBAAqB,KAAK,IAAI,CAAC,EAAE;AAE5C,UAAY,SAAS,oBAAI,SAAS,GAAG,GAAhB;AACrB,UAAM,OAAO,MAAM,mBAAmB,OAAO,IAAI,CAAC,EAAE;AACpD,WAAO;AAAA,WAFP;AAAA;AAAA;AAAA;AAAA;AAAA;AAGF;AAOA,eAAsB,OAClB,MACA,MAAoB,oBACP;AAIf;AAAA;AAHA,QAAI,CAAE,UAAU,KAAK,IAAI,EAAG,OAAM,IAAI,MAAM,0BAA0B,IAAI,GAAG;AAC7E,QAAI,OAAO,qBAAqB,KAAK,IAAI,CAAC,EAAE;AAE5C,UAAY,SAAS,oBAAI,SAAS,GAAG,GAAhB;AACrB,UAAM,OAAO,MAAM,2BAA2B,OAAO,IAAI,CAAC,EAAE;AAAA,WAD5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAEF;",
   "names": []
 }

package/dist/extract.cjs

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +20,47 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __using = (stack, value, async) => {
+  if (value != null) {
+    if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
+    var dispose, inner;
+    if (async) dispose = value[__knownSymbol("asyncDispose")];
+    if (dispose === void 0) {
+      dispose = value[__knownSymbol("dispose")];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") __typeError("Object not disposable");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    stack.push([async, dispose, value]);
+  } else if (async) {
+    stack.push([async]);
+  }
+  return value;
+};
+var __callDispose = (stack, error, hasError) => {
+  var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
+    return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
+  };
+  var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
+  var next = (it) => {
+    while (it = stack.pop()) {
+      try {
+        var result = it[1] && it[1].call(it[2]);
+        if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
+      } catch (e) {
+        fail(e);
+      }
+    }
+    if (hasError) throw error;
+  };
+  return next();
+};
 
 // extract.ts
 var extract_exports = {};
@@ -24,7 +69,6 @@ __export(extract_exports, {
 });
 module.exports = __toCommonJS(extract_exports);
 var import_pgproxy_client = require("@juit/pgproxy-client");
-var import_pgproxy_client_psql = require("@juit/pgproxy-client-psql");
 var query = `
   SELECT
     "c"."table_schema" AS "schema",
@@ -89,30 +133,33 @@ function stripUndefined(object) {
   return object;
 }
 async function extractSchema(url, schemas = [], extractAll = false) {
-  if (schemas.length === 0) schemas.push("public");
-  const client = new import_pgproxy_client.PGClient(url);
-  let rows;
+  var _stack = [];
   try {
+    if (schemas.length === 0) schemas.push("public");
+    const client = __using(_stack, new import_pgproxy_client.PGClient(url), true);
     const result = await client.query(query, [schemas]);
-    rows = result.rows;
-  } finally {
-    await client.destroy();
-  }
-  const schemaDef = {};
-  for (const row of rows) {
-    const { schema, table, column, description, enumValues, ...def } = row;
-    if (!extractAll) {
-      if (table.match(/^[^a-z]/i) || column.match(/^[^a-z]/i)) continue;
+    const rows = result.rows;
+    const schemaDef = {};
+    for (const row of rows) {
+      const { schema, table, column, description, enumValues, ...def } = row;
+      if (!extractAll) {
+        if (table.match(/^[^a-z]/i) || column.match(/^[^a-z]/i)) continue;
+      }
+      const name = schema === "public" ? `${table}` : `${schema}.${table}`;
+      const tableDef = schemaDef[name] || (schemaDef[name] = {});
+      tableDef[column] = stripUndefined({
+        ...def,
+        description: description?.trim() ? description.trim() : void 0,
+        enumValues: enumValues && enumValues.length ? enumValues : void 0
+      });
     }
-    const name = schema === "public" ? `${table}` : `${schema}.${table}`;
-    const tableDef = schemaDef[name] || (schemaDef[name] = {});
-    tableDef[column] = stripUndefined({
-      ...def,
-      description: description?.trim() ? description.trim() : void 0,
-      enumValues: enumValues && enumValues.length ? enumValues : void 0
-    });
+    return schemaDef;
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
   }
-  return schemaDef;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/extract.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/extract.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AACzB,iCAAO;AASP,IAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwEd,SAAS,eAA8C,QAAc;AACnE,aAAW,OAAO,OAAO,KAAK,MAAM,GAAG;AACrC,QAAI,OAAO,GAAG,MAAM,OAAW,QAAO,OAAO,GAAG;AAAA,EAClD;AACA,SAAO;AACT;AAoBA,eAAsB,cAClB,KACA,UAAoB,CAAC,GACrB,aAAsB,OACP;AACjB,MAAI,QAAQ,WAAW,EAAG,SAAQ,KAAK,QAAQ;AAE/C,QAAM,SAAS,IAAI,+BAAS,GAAG;AAC/B,MAAI;AACJ,MAAI;AACF,UAAM,SAAS,MAAM,OAAO,MAAiB,OAAO,CAAE,OAAQ,CAAC;AAC/D,WAAO,OAAO;AAAA,EAChB,UAAE;AACA,UAAM,OAAO,QAAQ;AAAA,EACvB;AAEA,QAAM,YAAoB,CAAC;AAE3B,aAAW,OAAO,MAAM;AACtB,UAAM,EAAE,QAAQ,OAAO,QAAQ,aAAa,YAAY,GAAG,IAAI,IAAI;AAEnE,QAAI,CAAE,YAAY;AAChB,UAAK,MAAM,MAAM,UAAU,KAAO,OAAO,MAAM,UAAU,EAAI;AAAA,IAC/D;AAEA,UAAM,OAAO,WAAW,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,IAAI,KAAK;AAClE,UAAM,WAAW,UAAU,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC;AAExD,aAAS,MAAM,IAAI,eAAe;AAAA,MAAE,GAAG;AAAA,MACrC,aAAa,aAAa,KAAK,IAAI,YAAY,KAAK,IAAI;AAAA,MACxD,YAAa,cAAc,WAAW,SAAU,aAAoB;AAAA,IACtE,CAAC;AAAA,EACH;AAEA,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AASzB,IAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwEd,SAAS,eAA8C,QAAc;AACnE,aAAW,OAAO,OAAO,KAAK,MAAM,GAAG;AACrC,QAAI,OAAO,GAAG,MAAM,OAAW,QAAO,OAAO,GAAG;AAAA,EAClD;AACA,SAAO;AACT;AAoBA,eAAsB,cAClB,KACA,UAAoB,CAAC,GACrB,aAAsB,OACP;AAGjB;AAAA;AAFA,QAAI,QAAQ,WAAW,EAAG,SAAQ,KAAK,QAAQ;AAE/C,UAAY,SAAS,oBAAI,+BAAS,GAAG,GAAhB;AACrB,UAAM,SAAS,MAAM,OAAO,MAAiB,OAAO,CAAE,OAAQ,CAAC;AAC/D,UAAM,OAAO,OAAO;AAEpB,UAAM,YAAoB,CAAC;AAE3B,eAAW,OAAO,MAAM;AACtB,YAAM,EAAE,QAAQ,OAAO,QAAQ,aAAa,YAAY,GAAG,IAAI,IAAI;AAEnE,UAAI,CAAE,YAAY;AAChB,YAAK,MAAM,MAAM,UAAU,KAAO,OAAO,MAAM,UAAU,EAAI;AAAA,MAC/D;AAEA,YAAM,OAAO,WAAW,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,IAAI,KAAK;AAClE,YAAM,WAAW,UAAU,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC;AAExD,eAAS,MAAM,IAAI,eAAe;AAAA,QAAE,GAAG;AAAA,QACrC,aAAa,aAAa,KAAK,IAAI,YAAY,KAAK,IAAI;AAAA,QACxD,YAAa,cAAc,WAAW,SAAU,aAAoB;AAAA,MACtE,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,WAtBP;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBF;",
   "names": []
 }

package/dist/extract.d.ts

@@ -1,4 +1,3 @@
-import '@juit/pgproxy-client-psql';
 import type { Schema } from './index';
 /**
  * Extract a {@link Schema} from an array of PosgreSQL schema names.

package/dist/extract.mjs

@@ -1,6 +1,51 @@
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __using = (stack, value, async) => {
+  if (value != null) {
+    if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
+    var dispose, inner;
+    if (async) dispose = value[__knownSymbol("asyncDispose")];
+    if (dispose === void 0) {
+      dispose = value[__knownSymbol("dispose")];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") __typeError("Object not disposable");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    stack.push([async, dispose, value]);
+  } else if (async) {
+    stack.push([async]);
+  }
+  return value;
+};
+var __callDispose = (stack, error, hasError) => {
+  var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
+    return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
+  };
+  var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
+  var next = (it) => {
+    while (it = stack.pop()) {
+      try {
+        var result = it[1] && it[1].call(it[2]);
+        if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
+      } catch (e) {
+        fail(e);
+      }
+    }
+    if (hasError) throw error;
+  };
+  return next();
+};
+
 // extract.ts
 import { PGClient } from "@juit/pgproxy-client";
-import "@juit/pgproxy-client-psql";
 var query = `
   SELECT
     "c"."table_schema" AS "schema",
@@ -65,30 +110,33 @@ function stripUndefined(object) {
   return object;
 }
 async function extractSchema(url, schemas = [], extractAll = false) {
-  if (schemas.length === 0) schemas.push("public");
-  const client = new PGClient(url);
-  let rows;
+  var _stack = [];
   try {
+    if (schemas.length === 0) schemas.push("public");
+    const client = __using(_stack, new PGClient(url), true);
     const result = await client.query(query, [schemas]);
-    rows = result.rows;
-  } finally {
-    await client.destroy();
-  }
-  const schemaDef = {};
-  for (const row of rows) {
-    const { schema, table, column, description, enumValues, ...def } = row;
-    if (!extractAll) {
-      if (table.match(/^[^a-z]/i) || column.match(/^[^a-z]/i)) continue;
+    const rows = result.rows;
+    const schemaDef = {};
+    for (const row of rows) {
+      const { schema, table, column, description, enumValues, ...def } = row;
+      if (!extractAll) {
+        if (table.match(/^[^a-z]/i) || column.match(/^[^a-z]/i)) continue;
+      }
+      const name = schema === "public" ? `${table}` : `${schema}.${table}`;
+      const tableDef = schemaDef[name] || (schemaDef[name] = {});
+      tableDef[column] = stripUndefined({
+        ...def,
+        description: description?.trim() ? description.trim() : void 0,
+        enumValues: enumValues && enumValues.length ? enumValues : void 0
+      });
     }
-    const name = schema === "public" ? `${table}` : `${schema}.${table}`;
-    const tableDef = schemaDef[name] || (schemaDef[name] = {});
-    tableDef[column] = stripUndefined({
-      ...def,
-      description: description?.trim() ? description.trim() : void 0,
-      enumValues: enumValues && enumValues.length ? enumValues : void 0
-    });
+    return schemaDef;
+  } catch (_) {
+    var _error = _, _hasError = true;
+  } finally {
+    var _promise = __callDispose(_stack, _error, _hasError);
+    _promise && await _promise;
   }
-  return schemaDef;
 }
 export {
   extractSchema

package/dist/extract.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/extract.ts"],
-  "mappings": ";AAAA,SAAS,gBAAgB;AACzB,OAAO;AASP,IAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwEd,SAAS,eAA8C,QAAc;AACnE,aAAW,OAAO,OAAO,KAAK,MAAM,GAAG;AACrC,QAAI,OAAO,GAAG,MAAM,OAAW,QAAO,OAAO,GAAG;AAAA,EAClD;AACA,SAAO;AACT;AAoBA,eAAsB,cAClB,KACA,UAAoB,CAAC,GACrB,aAAsB,OACP;AACjB,MAAI,QAAQ,WAAW,EAAG,SAAQ,KAAK,QAAQ;AAE/C,QAAM,SAAS,IAAI,SAAS,GAAG;AAC/B,MAAI;AACJ,MAAI;AACF,UAAM,SAAS,MAAM,OAAO,MAAiB,OAAO,CAAE,OAAQ,CAAC;AAC/D,WAAO,OAAO;AAAA,EAChB,UAAE;AACA,UAAM,OAAO,QAAQ;AAAA,EACvB;AAEA,QAAM,YAAoB,CAAC;AAE3B,aAAW,OAAO,MAAM;AACtB,UAAM,EAAE,QAAQ,OAAO,QAAQ,aAAa,YAAY,GAAG,IAAI,IAAI;AAEnE,QAAI,CAAE,YAAY;AAChB,UAAK,MAAM,MAAM,UAAU,KAAO,OAAO,MAAM,UAAU,EAAI;AAAA,IAC/D;AAEA,UAAM,OAAO,WAAW,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,IAAI,KAAK;AAClE,UAAM,WAAW,UAAU,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC;AAExD,aAAS,MAAM,IAAI,eAAe;AAAA,MAAE,GAAG;AAAA,MACrC,aAAa,aAAa,KAAK,IAAI,YAAY,KAAK,IAAI;AAAA,MACxD,YAAa,cAAc,WAAW,SAAU,aAAoB;AAAA,IACtE,CAAC;AAAA,EACH;AAEA,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,gBAAgB;AASzB,IAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwEd,SAAS,eAA8C,QAAc;AACnE,aAAW,OAAO,OAAO,KAAK,MAAM,GAAG;AACrC,QAAI,OAAO,GAAG,MAAM,OAAW,QAAO,OAAO,GAAG;AAAA,EAClD;AACA,SAAO;AACT;AAoBA,eAAsB,cAClB,KACA,UAAoB,CAAC,GACrB,aAAsB,OACP;AAGjB;AAAA;AAFA,QAAI,QAAQ,WAAW,EAAG,SAAQ,KAAK,QAAQ;AAE/C,UAAY,SAAS,oBAAI,SAAS,GAAG,GAAhB;AACrB,UAAM,SAAS,MAAM,OAAO,MAAiB,OAAO,CAAE,OAAQ,CAAC;AAC/D,UAAM,OAAO,OAAO;AAEpB,UAAM,YAAoB,CAAC;AAE3B,eAAW,OAAO,MAAM;AACtB,YAAM,EAAE,QAAQ,OAAO,QAAQ,aAAa,YAAY,GAAG,IAAI,IAAI;AAEnE,UAAI,CAAE,YAAY;AAChB,YAAK,MAAM,MAAM,UAAU,KAAO,OAAO,MAAM,UAAU,EAAI;AAAA,MAC/D;AAEA,YAAM,OAAO,WAAW,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,IAAI,KAAK;AAClE,YAAM,WAAW,UAAU,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC;AAExD,eAAS,MAAM,IAAI,eAAe;AAAA,QAAE,GAAG;AAAA,QACrC,aAAa,aAAa,KAAK,IAAI,YAAY,KAAK,IAAI;AAAA,QACxD,YAAa,cAAc,WAAW,SAAU,aAAoB;AAAA,MACtE,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,WAtBP;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBF;",
   "names": []
 }