@schemavaults/dbh 0.5.1 → 0.6.3

package/dist/PostgresDatabaseCredentials.d.ts

@@ -17,6 +17,12 @@ export interface PostgresDatabaseCredentials {
     POSTGRES_URL: string;
     POSTGRES_URL_NON_POOLING?: string;
     POSTGRES_HOST: string;
-    POSTGRES_PORT: number;
+    POSTGRES_PORT: number | string;
     POSTGRES_DATABASE: string;
 }
+export interface BaseInitializablePostgresDatabaseCredentials extends Partial<PostgresDatabaseCredentials> {
+    POSTGRES_HOST: string;
+    POSTGRES_DATABASE: string;
+    POSTGRES_USER: string;
+    POSTGRES_PASSWORD: string;
+}

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { SchemaVaultsPostgresNeonProxyAdapter, SchemaVaultsPostgresNeonProxyAdapter as default } from "./schemavaults-postgres-neon-proxy-adapter";
-export { sql } from "kysely";
+export { SchemaVaultsPostgresNeonProxyAdapter, SchemaVaultsPostgresNeonProxyAdapter as default, } from "./schemavaults-postgres-neon-proxy-adapter";
+export { sql } from "./sql";
 export type * from "kysely";

package/dist/index.js

@@ -1,3 +1,3 @@
-export { SchemaVaultsPostgresNeonProxyAdapter, SchemaVaultsPostgresNeonProxyAdapter as default } from "./schemavaults-postgres-neon-proxy-adapter";
-export { sql } from "kysely";
+export { SchemaVaultsPostgresNeonProxyAdapter, SchemaVaultsPostgresNeonProxyAdapter as default, } from "./schemavaults-postgres-neon-proxy-adapter";
+export { sql } from "./sql";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,oCAAoC,IAAI,OAAO,EAAE,MAAM,4CAA4C,CAAC;AACnJ,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oCAAoC,EACpC,oCAAoC,IAAI,OAAO,GAChD,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC"}

package/dist/schemavaults-postgres-neon-proxy-adapter.d.ts

@@ -1,9 +1,9 @@
 import { Kysely } from "kysely";
 import type { SchemaVaultsAppEnvironment } from "./SchemaVaultsAppEnvironment";
-import type { PostgresDatabaseCredentials } from "./PostgresDatabaseCredentials";
+import type { BaseInitializablePostgresDatabaseCredentials } from "./PostgresDatabaseCredentials";
 export interface ISchemaVaultsPostgresNeonProxyAdapterConstructorOpts {
     environment: SchemaVaultsAppEnvironment;
-    credentials?: PostgresDatabaseCredentials;
+    credentials?: BaseInitializablePostgresDatabaseCredentials;
 }
 export declare class SchemaVaultsPostgresNeonProxyAdapter<KyselyTablesType extends object> {
     private readonly kysely_db;
@@ -15,3 +15,4 @@ export declare class SchemaVaultsPostgresNeonProxyAdapter<KyselyTablesType exten
     get db(): Kysely<KyselyTablesType>;
     destroy(): Promise<void>;
 }
+export default SchemaVaultsPostgresNeonProxyAdapter;

package/dist/schemavaults-postgres-neon-proxy-adapter.js

@@ -5,6 +5,7 @@ import maybeStripQuotes from "./utils/maybeStripQuotes";
 import getPostgresNeonWsProxyUrl from "./utils/getPostgresNeonWsProxyUrl";
 import isDbhInDebugMode from "./utils/isDbhInDebugMode";
 import parseDatabaseCredentialsFromEnv from "./utils/parseDatabaseCredentialsFromEnv";
+import parseDatabaseCredentials from "./utils/parseDatabaseCredentials";
 export class SchemaVaultsPostgresNeonProxyAdapter {
     kysely_db;
     env;
@@ -22,7 +23,19 @@ export class SchemaVaultsPostgresNeonProxyAdapter {
         // checks if 'SCHEMAVAULTS_DBH_DEBUG="true"' is set in env vars, or defaults to yes if in dev/test/staging environment
         this.debug = isDbhInDebugMode(this.env);
         const debug = this.debug;
-        const credentials = opts.credentials ?? parseDatabaseCredentialsFromEnv(process.env, debug);
+        let credentials = undefined;
+        if (opts.credentials) {
+            credentials = parseDatabaseCredentials(opts.credentials, debug);
+        }
+        else {
+            credentials = parseDatabaseCredentialsFromEnv(process.env, debug);
+        }
+        const port = typeof credentials.POSTGRES_PORT === "number"
+            ? credentials.POSTGRES_PORT
+            : Number.parseInt(credentials.POSTGRES_PORT);
+        if (isNaN(port)) {
+            throw new Error(`Invalid port number: ${credentials.POSTGRES_PORT}`);
+        }
         const kysely_neon_dialect_config = {
             connectionString: credentials.POSTGRES_URL,
             host: credentials.POSTGRES_HOST,
@@ -30,7 +43,7 @@ export class SchemaVaultsPostgresNeonProxyAdapter {
             password: credentials.POSTGRES_PASSWORD,
             database: credentials.POSTGRES_DATABASE,
             useSecureWebSocket: (this.env === "production"),
-            port: credentials.POSTGRES_PORT,
+            port,
             wsProxy: (pg_host) => {
                 if (debug) {
                     console.log(`[SchemaVaultsPostgresNeonProxyAdapter] NeonDialectConfig.wsProxy("${pg_host}")`);
@@ -71,4 +84,5 @@ export class SchemaVaultsPostgresNeonProxyAdapter {
         return;
     }
 }
+export default SchemaVaultsPostgresNeonProxyAdapter;
 //# sourceMappingURL=schemavaults-postgres-neon-proxy-adapter.js.map

package/dist/schemavaults-postgres-neon-proxy-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemavaults-postgres-neon-proxy-adapter.js","sourceRoot":"","sources":["../src/schemavaults-postgres-neon-proxy-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schemavaults-postgres-neon-proxy-adapter.js","sourceRoot":"","sources":["../src/schemavaults-postgres-neon-proxy-adapter.ts"],"names":[],"mappings":"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"}

package/dist/sql.d.ts

@@ -0,0 +1,2 @@
+export { sql, sql as default } from "kysely";
+export type * from "kysely";

package/dist/sql.js

@@ -0,0 +1,2 @@
+export { sql, sql as default } from "kysely";
+//# sourceMappingURL=sql.js.map

package/dist/sql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../src/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,EAAE,MAAM,QAAQ,CAAC"}

package/dist/utils/buildPostgresUrl.d.ts

@@ -0,0 +1,3 @@
+import type { BaseInitializablePostgresDatabaseCredentials } from "../PostgresDatabaseCredentials";
+declare function buildPostgresUrl(opts: Pick<BaseInitializablePostgresDatabaseCredentials, "POSTGRES_HOST" | "POSTGRES_PORT" | "POSTGRES_USER" | "POSTGRES_PASSWORD" | "POSTGRES_DATABASE">): string;
+export default buildPostgresUrl;

package/dist/utils/buildPostgresUrl.js

@@ -0,0 +1,5 @@
+function buildPostgresUrl(opts) {
+    return `postgresql://${opts.POSTGRES_USER}:${opts.POSTGRES_PASSWORD}@${opts.POSTGRES_HOST}:${opts.POSTGRES_PORT}/${opts.POSTGRES_DATABASE}`;
+}
+export default buildPostgresUrl;
+//# sourceMappingURL=buildPostgresUrl.js.map

package/dist/utils/buildPostgresUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildPostgresUrl.js","sourceRoot":"","sources":["../../src/utils/buildPostgresUrl.ts"],"names":[],"mappings":"AAEA,SAAS,gBAAgB,CACvB,IAOC;IAED,OAAO,gBAAgB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;AAC9I,CAAC;AAED,eAAe,gBAAgB,CAAC"}

package/dist/utils/getPostgresNeonWsProxyUrl.js

@@ -13,11 +13,11 @@ export function getPostgresNeonWsProxyUrl({ pg_host, environment, ...opts }) {
             ws_host = "localhost";
         }
         else {
-            ws_host = "schemavaults-postgres-proxy-dev";
+            ws_host = "postgres-ws-proxy";
         }
     }
     else if (environment === "test" || environment === "staging") {
-        ws_host = "schemavaults-postgres-proxy-dev";
+        ws_host = "postgres-ws-proxy";
     }
     else {
         throw new Error("Failed to build 'ws_host' url for Postgres Neon proxy!");

package/dist/utils/getPostgresNeonWsProxyUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPostgresNeonWsProxyUrl.js","sourceRoot":"","sources":["../../src/utils/getPostgresNeonWsProxyUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAEtB,MAAM,8BAA8B,CAAC;AAQtC,MAAM,UAAU,yBAAyB,CAAC,EACxC,OAAO,EACP,WAAW,EACX,GAAG,IAAI,EACwB;IAC/B,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;IAC3C,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CACT,2EAA2E,WAAW,4BAA4B,EAClH,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAI,OAAe,CAAC;IACpB,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;QACjC,OAAO,GAAG,OAAO,CAAC;IACpB,CAAC;SAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,GAAG,WAAW,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,iCAAiC,CAAC;QAC9C,CAAC;IACH,CAAC;SAAM,IAAI,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/D,OAAO,GAAG,iCAAiC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,MAAM,CACZ,qBAAqB,CAAC,WAAW,CAAC,EAClC,6EAA6E,CAC9E,CAAC;IAEF,MAAM,uBAAuB,GAC3B,WAAW,KAAK,YAAY;QAC1B,CAAC,CAAE,IAA+B;QAClC,CAAC,CAAE,IAA+B,CAAC;IAEvC,MAAM,4BAA4B,GAAY,WAAW,KAAK,YAAY,CAAC;IAC3E,MAAM,gBAAgB,GAAY,4BAA4B,CAAC;IAE/D,MAAM,sBAAsB,GAC1B,GAAG,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,uBAAuB,EAA4B,CAAC;IAEtG,OAAO,CAAC,MAAM,CACZ,CAAC,sBAAsB,CAAC,UAAU,CAAC,OAAO,CAAC;QACzC,CAAC,sBAAsB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC9C,6FAA6F,CAC9F,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CACT,0DAA0D,EAC1D,sBAAsB,CACvB,CAAC;IACJ,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"getPostgresNeonWsProxyUrl.js","sourceRoot":"","sources":["../../src/utils/getPostgresNeonWsProxyUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAEtB,MAAM,8BAA8B,CAAC;AAQtC,MAAM,UAAU,yBAAyB,CAAC,EACxC,OAAO,EACP,WAAW,EACX,GAAG,IAAI,EACwB;IAC/B,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;IAC3C,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CACT,2EAA2E,WAAW,4BAA4B,EAClH,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAI,OAAe,CAAC;IACpB,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;QACjC,OAAO,GAAG,OAAO,CAAC;IACpB,CAAC;SAAM,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,GAAG,WAAW,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,mBAAmB,CAAC;QAChC,CAAC;IACH,CAAC;SAAM,IAAI,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/D,OAAO,GAAG,mBAAmB,CAAC;IAChC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,MAAM,CACZ,qBAAqB,CAAC,WAAW,CAAC,EAClC,6EAA6E,CAC9E,CAAC;IAEF,MAAM,uBAAuB,GAC3B,WAAW,KAAK,YAAY;QAC1B,CAAC,CAAE,IAA+B;QAClC,CAAC,CAAE,IAA+B,CAAC;IAEvC,MAAM,4BAA4B,GAAY,WAAW,KAAK,YAAY,CAAC;IAC3E,MAAM,gBAAgB,GAAY,4BAA4B,CAAC;IAE/D,MAAM,sBAAsB,GAC1B,GAAG,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,uBAAuB,EAA4B,CAAC;IAEtG,OAAO,CAAC,MAAM,CACZ,CAAC,sBAAsB,CAAC,UAAU,CAAC,OAAO,CAAC;QACzC,CAAC,sBAAsB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC9C,6FAA6F,CAC9F,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CACT,0DAA0D,EAC1D,sBAAsB,CACvB,CAAC;IACJ,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,eAAe,yBAAyB,CAAC"}

package/dist/utils/parseDatabaseCredentials.d.ts

@@ -0,0 +1,3 @@
+import type { BaseInitializablePostgresDatabaseCredentials, PostgresDatabaseCredentials } from "../PostgresDatabaseCredentials";
+declare function parseDatabaseCredentials(minimum_credentials: Partial<PostgresDatabaseCredentials> & BaseInitializablePostgresDatabaseCredentials, debug?: boolean): PostgresDatabaseCredentials;
+export default parseDatabaseCredentials;

package/dist/utils/parseDatabaseCredentials.js

@@ -0,0 +1,73 @@
+import maybeStripQuotes from "../utils/maybeStripQuotes";
+import buildPostgresUrl from "./buildPostgresUrl";
+function parseDatabaseCredentials(minimum_credentials, debug = false) {
+    const POSTGRES_URL_NON_POOLING = maybeStripQuotes(minimum_credentials.POSTGRES_URL_NON_POOLING);
+    if (!POSTGRES_URL_NON_POOLING) {
+        console.warn("POSTGRES_URL_NON_POOLING is not set in environment variables!");
+    }
+    else {
+        if (debug) {
+            console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using postgres no-pooling connection url POSTGRES_URL_NON_POOLING: \"${POSTGRES_URL_NON_POOLING}\"`);
+        }
+    }
+    const POSTGRES_HOST = maybeStripQuotes(minimum_credentials.POSTGRES_HOST);
+    if (!POSTGRES_HOST) {
+        throw new Error("POSTGRES_HOST is not set in environment variables!");
+    }
+    else {
+        if (debug) {
+            console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using database POSTGRES_HOST: \"${POSTGRES_HOST}\"`);
+        }
+    }
+    let POSTGRES_PORT = 5432;
+    if (typeof minimum_credentials.POSTGRES_PORT === "string" &&
+        minimum_credentials.POSTGRES_PORT.length > 0) {
+        POSTGRES_PORT = Number.parseInt(maybeStripQuotes(minimum_credentials.POSTGRES_PORT) ?? "NaN");
+    }
+    if (typeof POSTGRES_PORT !== "number" || isNaN(POSTGRES_PORT)) {
+        throw new Error("Failed to load POSTGRES_PORT from environment variables! NaN error!");
+    }
+    const POSTGRES_DATABASE = maybeStripQuotes(minimum_credentials.POSTGRES_DATABASE);
+    if (!POSTGRES_DATABASE) {
+        throw new Error("Failed to load database name from POSTGRES_DATABASE environment variable!");
+    }
+    const POSTGRES_USER = maybeStripQuotes(minimum_credentials.POSTGRES_USER);
+    if (!POSTGRES_USER) {
+        throw new Error("POSTGRES_USER is not defined in environment variables!");
+    }
+    const POSTGRES_PASSWORD = maybeStripQuotes(minimum_credentials.POSTGRES_PASSWORD);
+    if (!POSTGRES_PASSWORD) {
+        throw new Error("POSTGRES_PASSWORD is not defined in environment variables!");
+    }
+    let POSTGRES_URL = "";
+    if (typeof minimum_credentials.POSTGRES_URL === "string" &&
+        minimum_credentials.POSTGRES_URL.length > 0) {
+        POSTGRES_URL = maybeStripQuotes(minimum_credentials.POSTGRES_URL) ?? "";
+    }
+    else {
+        POSTGRES_URL = buildPostgresUrl({
+            POSTGRES_DATABASE,
+            POSTGRES_HOST,
+            POSTGRES_PORT,
+            POSTGRES_USER,
+            POSTGRES_PASSWORD,
+        });
+    }
+    if (!POSTGRES_URL) {
+        throw new Error("Failed to load POSTGRES_URL from environment variables, or to construct it from other environment variables!");
+    }
+    if (debug) {
+        console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using postgres connection url POSTGRES_URL: \"${POSTGRES_URL}\"`);
+    }
+    return {
+        POSTGRES_USER,
+        POSTGRES_PASSWORD,
+        POSTGRES_URL,
+        POSTGRES_URL_NON_POOLING,
+        POSTGRES_HOST,
+        POSTGRES_PORT,
+        POSTGRES_DATABASE,
+    };
+}
+export default parseDatabaseCredentials;
+//# sourceMappingURL=parseDatabaseCredentials.js.map

package/dist/utils/parseDatabaseCredentials.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseDatabaseCredentials.js","sourceRoot":"","sources":["../../src/utils/parseDatabaseCredentials.ts"],"names":[],"mappings":"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"}

package/dist/utils/parseDatabaseCredentialsFromEnv.d.ts

@@ -1,3 +1,3 @@
-import { PostgresDatabaseCredentials } from "../PostgresDatabaseCredentials";
+import type { PostgresDatabaseCredentials } from "../PostgresDatabaseCredentials";
 export declare function parseDatabaseCredentialsFromEnv(env: NodeJS.ProcessEnv, debug?: boolean): PostgresDatabaseCredentials;
 export default parseDatabaseCredentialsFromEnv;

package/dist/utils/parseDatabaseCredentialsFromEnv.js

@@ -1,57 +1,6 @@
-import maybeStripQuotes from "./maybeStripQuotes";
+import parseDatabaseCredentials from "./parseDatabaseCredentials";
 export function parseDatabaseCredentialsFromEnv(env, debug = false) {
-    const POSTGRES_URL = maybeStripQuotes(env.POSTGRES_URL);
-    if (!POSTGRES_URL) {
-        throw new Error("POSTGRES_URL is not set in environment variables!");
-    }
-    else {
-        if (debug) {
-            console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using postgres connection url POSTGRES_URL: \"${POSTGRES_URL}\"`);
-        }
-    }
-    const POSTGRES_URL_NON_POOLING = maybeStripQuotes(env.POSTGRES_URL_NON_POOLING);
-    if (!POSTGRES_URL_NON_POOLING) {
-        console.warn("POSTGRES_URL_NON_POOLING is not set in environment variables!");
-    }
-    else {
-        if (debug) {
-            console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using postgres no-pooling connection url POSTGRES_URL_NON_POOLING: \"${POSTGRES_URL_NON_POOLING}\"`);
-        }
-    }
-    const POSTGRES_HOST = maybeStripQuotes(env.POSTGRES_HOST);
-    if (!POSTGRES_HOST) {
-        throw new Error("POSTGRES_HOST is not set in environment variables!");
-    }
-    else {
-        if (debug) {
-            console.log(`[SchemaVaultsPostgresNeonProxyAdapter] Using database POSTGRES_HOST: \"${POSTGRES_HOST}\"`);
-        }
-    }
-    const POSTGRES_PORT = Number.parseInt(maybeStripQuotes(env.POSTGRES_PORT) ?? "NaN");
-    if (isNaN(POSTGRES_PORT)) {
-        throw new Error("Failed to load POSTGRES_PORT from environment variables! NaN error!");
-    }
-    const POSTGRES_DATABASE = maybeStripQuotes(env.POSTGRES_DATABASE);
-    if (!POSTGRES_DATABASE) {
-        throw new Error("Failed to load database name from POSTGRES_DATABASE environment variable!");
-    }
-    const POSTGRES_USER = maybeStripQuotes(env.POSTGRES_USER);
-    if (!POSTGRES_USER) {
-        throw new Error("POSTGRES_USER is not defined in environment variables!");
-    }
-    const POSTGRES_PASSWORD = maybeStripQuotes(env.POSTGRES_PASSWORD);
-    if (!POSTGRES_PASSWORD) {
-        throw new Error("POSTGRES_PASSWORD is not defined in environment variables!");
-    }
-    return {
-        POSTGRES_USER,
-        POSTGRES_PASSWORD,
-        POSTGRES_URL,
-        POSTGRES_URL_NON_POOLING,
-        POSTGRES_HOST,
-        POSTGRES_PORT,
-        POSTGRES_DATABASE,
-    };
+    return parseDatabaseCredentials(process.env, debug);
 }
 export default parseDatabaseCredentialsFromEnv;
 //# sourceMappingURL=parseDatabaseCredentialsFromEnv.js.map

package/dist/utils/parseDatabaseCredentialsFromEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseDatabaseCredentialsFromEnv.js","sourceRoot":"","sources":["../../src/utils/parseDatabaseCredentialsFromEnv.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,+BAA+B,CAAC,GAAsB,EAAE,QAAiB,KAAK;IAC5F,MAAM,YAAY,GAAG,gBAAgB,CACjC,GAAG,CAAC,YAAY,CACjB,CAAC;IACF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CACT,wFAAwF,YAAY,IAAI,CACzG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,wBAAwB,GAC5B,gBAAgB,CACd,GAAG,CAAC,wBAAwB,CAC7B,CAAC;IACJ,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,CACV,+DAA+D,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CACT,+GAA+G,wBAAwB,IAAI,CAC5I,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CACpC,GAAG,CAAC,aAAa,CAClB,CAAC;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CACT,0EAA0E,aAAa,IAAI,CAC5F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAW,MAAM,CAAC,QAAQ,CAC3C,gBAAgB,CACd,GAAG,CAAC,aAAa,CAClB,IAAI,KAAK,CACX,CAAC;IACF,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GACrB,gBAAgB,CACd,GAAG,CAAC,iBAAiB,CACtB,CAAC;IACJ,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CACpC,GAAG,CAAC,aAAa,CAClB,CAAC;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,iBAAiB,GACrB,gBAAgB,CACd,GAAG,CAAC,iBAAiB,CACtB,CAAC;IACJ,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAED,OAAO;QACL,aAAa;QACb,iBAAiB;QACjB,YAAY;QACZ,wBAAwB;QACxB,aAAa;QACb,aAAa;QACb,iBAAiB;KAClB,CAAA;AACL,CAAC;AAED,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"parseDatabaseCredentialsFromEnv.js","sourceRoot":"","sources":["../../src/utils/parseDatabaseCredentialsFromEnv.ts"],"names":[],"mappings":"AAEA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,MAAM,UAAU,+BAA+B,CAC7C,GAAsB,EACtB,QAAiB,KAAK;IAEtB,OAAO,wBAAwB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AAED,eAAe,+BAA+B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schemavaults/dbh",
-  "version": "0.5.1",
+  "version": "0.6.3",
   "description": "Easily connect to PostgresDB from serverless environment",
   "license": "UNLICENSED",
   "private": false,
@@ -20,11 +20,14 @@
   },
   "scripts": {
     "build": "tsc --project tsconfig.json && tsc-alias --project tsconfig.json",
-    "test": "bun test",
-    "test:watch": "bun test --watch",
+    "test:unit": "bun test --test-name-pattern 'DBH Init'",
+    "test": "bun run test:unit",
+    "test:e2e": "bun test ./src/tests/e2e/ConnectToLocalDatabase.test.ts",
     "cleanup:compiled_tests_in_dist_directory": "find ./dist -type f \\( -name \"*.test.js\" -o -name \"*.test.js.map\" -o -name \"*.test.d.ts\" \\) -delete",
+    "cleanup:rm_tests_dir": "rm -rf ./dist/tests",
     "cleanup": "bun run cleanup:compiled_tests_in_dist_directory",
-    "postbuild": "bun run cleanup"
+    "postbuild": "bun run cleanup",
+    "version": "bun run ./scripts/package_version.ts"
   },
   "main": "dist/index.js",
   "module": "dist/index.js",

package/.npmrc.github

@@ -1,3 +0,0 @@
-@schemavaults:registry=https://npm.pkg.github.com
-//https://npm.pkg.github.com/:username=${SCHEMAVAULTS_GITHUB_PACKAGE_REGISTRY_USER}
-//https://npm.pkg.github.com/:_authToken=${SCHEMAVAULTS_GITHUB_PACKAGE_REGISTRY_TOKEN}

package/.npmrc.npmjs

@@ -1,3 +0,0 @@
-@schemavaults:registry=https://registry.npmjs.org
-//https://registry.npmjs.org/:username=${NPM_PACKAGE_PUBLISH_USER}
-//https://registry.npmjs.org/:_authToken=${NPM_PACKAGE_PUBLISH_TOKEN}

package/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "outDir": "dist",
-    "target": "ESNext",
-    "moduleResolution": "Bundler",
-    "isolatedModules": true,
-    "module": "ESNext",
-    "skipLibCheck": true,
-    "declaration": true,
-    "emitDeclarationOnly": false,
-    "sourceMap": true,
-    "esModuleInterop": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "types": ["bun-types"],
-    "paths": {
-      "@/*": ["src/*"]
-    },
-    "baseUrl": "."
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist"]
-}