appos 0.3.4-0 → 0.3.5-0

package/dist/exports/api/database.d.mts

@@ -3,10 +3,12 @@ import * as drizzle_orm22 from "drizzle-orm";
 import { AnyRelations, EmptyRelations } from "drizzle-orm";
 import { PgTable } from "drizzle-orm/pg-core";
 import * as drizzle_orm_node_postgres0 from "drizzle-orm/node-postgres";
-import { Pool, PoolConfig } from "pg";
+import * as pg0 from "pg";
+import pg from "pg";
 import { MigrationConfig } from "drizzle-orm/migrator";
 
 //#region src/api/database.d.ts
+type PoolConfig = pg.PoolConfig;
 /**
  * Extract qualified table names from db object.
  */
@@ -69,7 +71,7 @@ declare function dbChanges<T extends PgTable>(table: T): {
  * @returns The defined database instance.
  */
 declare function defineDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineDatabaseOptions<TSchema, TRelations>): Promise<drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-  $client: Pool;
+  $client: pg0.Pool;
 }>;
 /**
  * Options for defining a test database.
@@ -91,7 +93,7 @@ interface DefineTestDatabaseOptions<TSchema extends Record<string, unknown> = Re
 declare function defineTestDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineTestDatabaseOptions<TSchema, TRelations>): Promise<{
   cleanUp: () => Promise<void>;
   db: drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-    $client: Pool;
+    $client: pg0.Pool;
   };
   dbName: string;
 }>;

package/dist/exports/api/database.mjs

@@ -3,9 +3,10 @@ import { getTableName, sql } from "drizzle-orm";
 import { join } from "node:path";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
-import { Client, Pool } from "pg";
+import pg from "pg";
 
 //#region src/api/database.ts
+const { Client, Pool: Pool$1 } = pg;
 /**
 * The schema used for migrations.
 */
@@ -67,7 +68,7 @@ function dbChanges(table) {
 */
 async function defineDatabase(opts) {
 	return drizzle({
-		client: new Pool({
+		client: new Pool$1({
 			application_name: "appos",
 			max: 16,
 			...opts.poolConfig
@@ -98,7 +99,7 @@ async function defineTestDatabase(opts) {
 	}
 	const testComponents = parsePostgresUrl(opts.connectionString);
 	testComponents.database = dbName;
-	const testPool = new Pool({ connectionString: buildPostgresUrl(testComponents) });
+	const testPool = new Pool$1({ connectionString: buildPostgresUrl(testComponents) });
 	const db = drizzle({
 		client: testPool,
 		logger: opts.logger ? new DatabaseLogger(opts.logger) : void 0,
@@ -198,7 +199,7 @@ async function ensureTemplateDatabase(connectionString, name, logger) {
 			await maintenanceClient.query(`CREATE DATABASE ${templateDbName} WITH IS_TEMPLATE = true`);
 			const components = parsePostgresUrl(connectionString);
 			components.database = templateDbName;
-			const templatePool = new Pool({ connectionString: buildPostgresUrl(components) });
+			const templatePool = new Pool$1({ connectionString: buildPostgresUrl(components) });
 			try {
 				await migrate(drizzle({
 					client: templatePool,

package/dist/exports/api/workflows/api/database.d.mts

@@ -2,10 +2,11 @@ import { Logger } from "./logger.mjs";
 import { AnyRelations, EmptyRelations } from "drizzle-orm";
 import "drizzle-orm/pg-core";
 import * as drizzle_orm_node_postgres0 from "drizzle-orm/node-postgres";
-import { Pool, PoolConfig } from "pg";
+import * as pg0 from "pg";
+import pg from "pg";
 
 //#region src/api/database.d.ts
-
+type PoolConfig = pg.PoolConfig;
 /**
  * Extract qualified table names from db object.
  */
@@ -40,7 +41,7 @@ type Database = Awaited<ReturnType<typeof defineDatabase>>;
  * @returns The defined database instance.
  */
 declare function defineDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineDatabaseOptions<TSchema, TRelations>): Promise<drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-  $client: Pool;
+  $client: pg0.Pool;
 }>;
 //#endregion
 export { Database, QualifiedTableNames };

package/dist/exports/cli/api/database.d.mts

@@ -2,10 +2,11 @@ import { Logger } from "./logger.mjs";
 import { AnyRelations, EmptyRelations } from "drizzle-orm";
 import "drizzle-orm/pg-core";
 import * as drizzle_orm_node_postgres0 from "drizzle-orm/node-postgres";
-import { Pool, PoolConfig } from "pg";
+import * as pg0 from "pg";
+import pg from "pg";
 
 //#region src/api/database.d.ts
-
+type PoolConfig = pg.PoolConfig;
 /**
  * Extract qualified table names from db object.
  */
@@ -40,7 +41,7 @@ type Database = Awaited<ReturnType<typeof defineDatabase>>;
  * @returns The defined database instance.
  */
 declare function defineDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineDatabaseOptions<TSchema, TRelations>): Promise<drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-  $client: Pool;
+  $client: pg0.Pool;
 }>;
 //#endregion
 export { Database, QualifiedTableNames };

package/dist/exports/tests/api/database.d.mts

@@ -2,11 +2,13 @@ import { Logger } from "./logger.mjs";
 import * as drizzle_orm0 from "drizzle-orm";
 import { AnyRelations, EmptyRelations } from "drizzle-orm";
 import * as drizzle_orm_node_postgres0 from "drizzle-orm/node-postgres";
-import { Pool, PoolConfig } from "pg";
+import * as pg0 from "pg";
+import pg from "pg";
 import { PgTable } from "drizzle-orm/pg-core";
 import { MigrationConfig } from "drizzle-orm/migrator";
 
 //#region src/api/database.d.ts
+type PoolConfig = pg.PoolConfig;
 /**
  * Extract qualified table names from db object.
  */
@@ -69,7 +71,7 @@ declare function dbChanges<T extends PgTable>(table: T): {
  * @returns The defined database instance.
  */
 declare function defineDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineDatabaseOptions<TSchema, TRelations>): Promise<drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-  $client: Pool;
+  $client: pg0.Pool;
 }>;
 /**
  * Options for defining a test database.
@@ -91,7 +93,7 @@ interface DefineTestDatabaseOptions<TSchema extends Record<string, unknown> = Re
 declare function defineTestDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(opts: DefineTestDatabaseOptions<TSchema, TRelations>): Promise<{
   cleanUp: () => Promise<void>;
   db: drizzle_orm_node_postgres0.NodePgDatabase<TSchema, TRelations> & {
-    $client: Pool;
+    $client: pg0.Pool;
   };
   dbName: string;
 }>;

package/dist/exports/tests/api/database.mjs

@@ -1 +1 @@
-import{APPOS_DIR as e,DATABASES_DIR as t}from"../constants.mjs";import{join as n}from"node:path";import{sql as r}from"drizzle-orm";import{drizzle as i}from"drizzle-orm/node-postgres";import{migrate as a}from"drizzle-orm/node-postgres/migrator";import{Client as o,Pool as s}from"pg";function c(r,i=`schema`){let a=i===`schema`?`schema-migrations`:`data-migrations`,o=i===`schema`?`schema-migrations`:`data-migrations`;return{migrationsFolder:`${n(e,t)}/${r}/${a}`,migrationsSchema:`public`,migrationsTable:o}}var l=class{#e;constructor(e){this.#e=e}logQuery(e,t){this.#e.info(t,e)}};async function u(e){let t=`test_w${process.env.VITEST_POOL_ID||`0`}_${Date.now()}_${Math.random().toString(36).substring(2,8)}`;await h(e.connectionString,e.name,e.logger);let n=`${e.name}_test_template`,r=p(e.connectionString),a=new o({connectionString:r});await a.connect();try{await a.query(`CREATE DATABASE ${t} WITH TEMPLATE ${n}`)}finally{await a.end()}let c=d(e.connectionString);c.database=t;let u=new s({connectionString:f(c)});return{cleanUp:async()=>{await u.end();let e=new o({connectionString:r});await e.connect();try{await e.query(`SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1`,[t]),await e.query(`DROP DATABASE IF EXISTS ${t}`)}catch(e){console.error(`Could not drop test database:`,e)}finally{await e.end()}},db:i({client:u,logger:e.logger?new l(e.logger):void 0,relations:e.relations,schema:e.schema}),dbName:t}}function d(e){let t=new URL(e);return{database:t.pathname.slice(1)||`postgres`,host:t.hostname,password:decodeURIComponent(t.password),port:Number.parseInt(t.port||`5432`,10),user:decodeURIComponent(t.username)}}function f(e){let{user:t,password:n,host:r,port:i,database:a}=e;return`postgresql://${encodeURIComponent(t)}:${encodeURIComponent(n)}@${r}:${i}/${a}`}function p(e){let t=d(e);return t.database=`postgres`,f(t)}function m(e){let t=0;for(let n=0;n<e.length;n++){let r=e.charCodeAt(n);t=(t<<5)-t+r,t&=t}return Math.abs(t)}async function h(e,t,n){let r=`${t}_test_template`,u=new o({connectionString:p(e)});await u.connect();let h=m(r);try{if(await u.query(`SELECT pg_advisory_lock($1)`,[h]),(await u.query(`SELECT 1 FROM pg_database WHERE datname = $1`,[r])).rowCount===0){await u.query(`CREATE DATABASE ${r} WITH IS_TEMPLATE = true`);let o=d(e);o.database=r;let p=new s({connectionString:f(o)});try{await a(i({client:p,logger:n?new l(n):void 0}),c(t))}finally{await p.end()}}}finally{await u.query(`SELECT pg_advisory_unlock($1)`,[h]),await u.end()}}export{u as defineTestDatabase};
+import{APPOS_DIR as e,DATABASES_DIR as t}from"../constants.mjs";import{join as n}from"node:path";import{sql as r}from"drizzle-orm";import{drizzle as i}from"drizzle-orm/node-postgres";import{migrate as a}from"drizzle-orm/node-postgres/migrator";import o from"pg";const{Client:s,Pool:c}=o;function l(r,i=`schema`){let a=i===`schema`?`schema-migrations`:`data-migrations`,o=i===`schema`?`schema-migrations`:`data-migrations`;return{migrationsFolder:`${n(e,t)}/${r}/${a}`,migrationsSchema:`public`,migrationsTable:o}}var u=class{#e;constructor(e){this.#e=e}logQuery(e,t){this.#e.info(t,e)}};async function d(e){let t=`test_w${process.env.VITEST_POOL_ID||`0`}_${Date.now()}_${Math.random().toString(36).substring(2,8)}`;await g(e.connectionString,e.name,e.logger);let n=`${e.name}_test_template`,r=m(e.connectionString),a=new s({connectionString:r});await a.connect();try{await a.query(`CREATE DATABASE ${t} WITH TEMPLATE ${n}`)}finally{await a.end()}let o=f(e.connectionString);o.database=t;let l=new c({connectionString:p(o)});return{cleanUp:async()=>{await l.end();let e=new s({connectionString:r});await e.connect();try{await e.query(`SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1`,[t]),await e.query(`DROP DATABASE IF EXISTS ${t}`)}catch(e){console.error(`Could not drop test database:`,e)}finally{await e.end()}},db:i({client:l,logger:e.logger?new u(e.logger):void 0,relations:e.relations,schema:e.schema}),dbName:t}}function f(e){let t=new URL(e);return{database:t.pathname.slice(1)||`postgres`,host:t.hostname,password:decodeURIComponent(t.password),port:Number.parseInt(t.port||`5432`,10),user:decodeURIComponent(t.username)}}function p(e){let{user:t,password:n,host:r,port:i,database:a}=e;return`postgresql://${encodeURIComponent(t)}:${encodeURIComponent(n)}@${r}:${i}/${a}`}function m(e){let t=f(e);return t.database=`postgres`,p(t)}function h(e){let t=0;for(let n=0;n<e.length;n++){let r=e.charCodeAt(n);t=(t<<5)-t+r,t&=t}return Math.abs(t)}async function g(e,t,n){let r=`${t}_test_template`,o=new s({connectionString:m(e)});await o.connect();let d=h(r);try{if(await o.query(`SELECT pg_advisory_lock($1)`,[d]),(await o.query(`SELECT 1 FROM pg_database WHERE datname = $1`,[r])).rowCount===0){await o.query(`CREATE DATABASE ${r} WITH IS_TEMPLATE = true`);let s=f(e);s.database=r;let d=new c({connectionString:p(s)});try{await a(i({client:d,logger:n?new u(n):void 0}),l(t))}finally{await d.end()}}}finally{await o.query(`SELECT pg_advisory_unlock($1)`,[d]),await o.end()}}export{d as defineTestDatabase};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appos",
-	"version": "0.3.4-0",
+	"version": "0.3.5-0",
 	"type": "module",
 	"scripts": {
 		"release": "release-it",