@tstdl/base 0.92.70 → 0.92.72

package/orm/server/database.d.ts

@@ -1,8 +1,8 @@
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { migrate } from 'drizzle-orm/node-postgres/migrator';
-import type { PoolConfig } from 'pg';
+import { type PoolConfig } from 'pg';
 import type { Resolvable, resolveArgumentType } from '../../injector/interfaces.js';
-export type DatabaseArgument = string | PoolConfig;
+export type DatabaseArgument = PoolConfig;
 export declare class Database extends NodePgDatabase<any> implements Resolvable<DatabaseArgument> {
     readonly [resolveArgumentType]?: DatabaseArgument;
 }

package/orm/server/database.js

@@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { drizzle, NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { migrate } from 'drizzle-orm/node-postgres/migrator';
+import { Pool } from 'pg';
 import { inject, Injector, ReplaceClass } from '../../injector/index.js';
 import { isUndefined } from '../../utils/type-guards.js';
 import { DatabaseConfig } from './module.js';
@@ -16,12 +17,14 @@ Database = __decorate([
 ], Database);
 export { Database };
 Injector.registerSingleton(Database, {
-    useFactory: (argument) => {
+    useFactory: (argument, context) => {
         const connection = argument ?? inject(DatabaseConfig, undefined, { optional: true })?.connection;
         if (isUndefined(connection)) {
             throw new Error('Missing postgres connection. Provide it either via injection argument or provider.');
         }
-        return drizzle({ connection });
+        const pool = new Pool(connection);
+        context.addDisposeHandler(async () => pool.end());
+        return drizzle(pool);
     }
 });
 export { migrate };

package/orm/server/drizzle/schema-converter.js

@@ -136,7 +136,7 @@ function getPostgresColumn(columnName, dbSchema, propertySchema, reflectionData,
             break;
         }
     }
-    let column = getPostgresBaseColumn(columnName, dbSchema, baseSchema, context);
+    let column = getPostgresBaseColumn(columnName, dbSchema, baseSchema, reflectionData, context);
     if (array) {
         column = column.array();
     }
@@ -154,11 +154,14 @@ function getPostgresColumn(columnName, dbSchema, propertySchema, reflectionData,
     }
     return column;
 }
-function getPostgresBaseColumn(columnName, dbSchema, schema, context) {
+function getPostgresBaseColumn(columnName, dbSchema, schema, reflectionData, context) {
     if (schema instanceof DefaultSchema) {
-        const column = getPostgresBaseColumn(columnName, dbSchema, schema.schema, context);
+        const column = getPostgresBaseColumn(columnName, dbSchema, schema.schema, reflectionData, context);
         return column.default(schema.defaultValue);
     }
+    if (reflectionData.encrypted) {
+        return bytea(columnName);
+    }
     if (schema instanceof UuidSchema) {
         let column = uuid(columnName);
         if (schema.defaultRandom) {

package/orm/server/module.d.ts

@@ -1,10 +1,10 @@
 import type { PoolConfig } from 'pg';
 import { EntityRepositoryConfig } from './repository.js';
 export declare class DatabaseConfig {
-    connection?: string | PoolConfig;
+    connection?: PoolConfig;
 }
 export type OrmModuleOptions = {
-    connection?: string | PoolConfig;
+    connection?: PoolConfig;
     repositoryConfig?: EntityRepositoryConfig;
 };
 export declare function configureOrm(options: OrmModuleOptions & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.70",
+  "version": "0.92.72",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"