@tstdl/base 0.92.72 → 0.92.74

package/orm/server/database.d.ts

@@ -1,6 +1,6 @@
 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 = PoolConfig;
 export declare class Database extends NodePgDatabase<any> implements Resolvable<DatabaseArgument> {

package/orm/server/database.js

@@ -6,7 +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 pg from 'pg';
 import { inject, Injector, ReplaceClass } from '../../injector/index.js';
 import { isUndefined } from '../../utils/type-guards.js';
 import { DatabaseConfig } from './module.js';
@@ -20,9 +20,9 @@ Injector.registerSingleton(Database, {
     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.');
+            throw new Error('Missing postgres connection. Provide it either via injection argument or a provider for DatabaseConfig.');
         }
-        const pool = new Pool(connection);
+        const pool = new pg.Pool(connection);
         context.addDisposeHandler(async () => pool.end());
         return drizzle(pool);
     }

package/orm/server/repository.d.ts

@@ -89,7 +89,7 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     protected mapManyToInsertColumns(objects: (DeepPartial<T> | NewEntity<T>)[], transformContext: TransformContext): Promise<PgInsertValue<PgTableFromType<string, EntityType>>[]>;
     protected mapToInsertColumns(obj: DeepPartial<T> | NewEntity<T>, transformContext: TransformContext): Promise<PgInsertValue<PgTableFromType<string, EntityType>>>;
     protected mapUpdate(update: EntityUpdate<T>, transformContext: TransformContext): Promise<PgUpdateSetSource<PgTableFromType<string, EntityType>>>;
-    protected getIdLimitQuery(query: Query<T>): import("drizzle-orm/pg-core").WithSubqueryWithSelection<{
+    protected getIdLimitQuery(query: Query<T>): Omit<import("drizzle-orm/pg-core").PgSelectBase<string, {
         id: PgColumn<{
             name: string;
             tableName: string;
@@ -107,7 +107,27 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-    }, "id">;
+    }, "partial", globalThis.Record<string, "not-null">, false, "where" | "limit", {
+        id: string;
+    }[], {
+        id: PgColumn<{
+            name: string;
+            tableName: string;
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    }>, "where" | "limit">;
     protected getAttributesUpdate(attributes: EntityMetadataAttributes | undefined): SQL<unknown> | undefined;
     protected getTransformContext(): Promise<TransformContext>;
 }

package/orm/server/repository.js

@@ -268,7 +268,6 @@ let EntityRepository = class EntityRepository {
         const mappedUpdate = await this.mapUpdate(update, transformContext);
         const idQuery = this.getIdLimitQuery(query);
         const [row] = await this.session
-            .with(idQuery)
             .update(this.table)
             .set(mappedUpdate)
             .where(inArray(this.table.id, idQuery))
@@ -367,7 +366,6 @@ let EntityRepository = class EntityRepository {
     async hardDeleteByQuery(query) {
         const idQuery = this.getIdLimitQuery(query);
         const result = await this.session
-            .with(idQuery)
             .delete(this.table)
             .where(inArray(this.table.id, idQuery));
         console.log({ deleteResult: result });
@@ -439,10 +437,10 @@ let EntityRepository = class EntityRepository {
     }
     getIdLimitQuery(query) {
         const sqlQuery = this.convertQuery(query);
-        return this.session.$with('id').as(this.session.select({ id: this.table.id })
+        return this.session.select({ id: this.table.id })
             .from(this.table)
             .where(sqlQuery)
-            .limit(1));
+            .limit(1);
     }
     getAttributesUpdate(attributes) {
         if (isUndefined(attributes)) {

package/package.json

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