@tstdl/base 0.92.122 → 0.92.123

package/orm/server/repository.d.ts

@@ -77,7 +77,9 @@ export declare class EntityRepository<T extends Entity | EntityWithoutMetadata =
     hardDeleteManyByQuery(query: Query<T>): Promise<T[]>;
     getColumn(pathOrColumn: Paths<UntaggedDeep<T>> | ColumnDefinition): PgColumn;
     convertOrderBy(order: Order<T>): SQL[];
-    convertQuery(query: Query<T>): SQL;
+    convertQuery(query: Query<T>, options?: {
+        withDeleted?: boolean;
+    }): SQL;
     mapManyToEntity(columns: InferSelect[]): Promise<T[]>;
     mapToEntity(columns: InferSelect): Promise<T>;
     mapManyToColumns(objects: (DeepPartial<T> | NewEntity<T>)[]): Promise<PgInsertValue<PgTableFromType>[]>;

package/orm/server/repository.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { asc, count, desc, eq, inArray, isSQLWrapper, SQL, sql } from 'drizzle-orm';
+import { and, asc, count, desc, eq, inArray, isNull, isSQLWrapper, SQL, sql } from 'drizzle-orm';
 import { PgTransaction as DrizzlePgTransaction } from 'drizzle-orm/pg-core';
 import { createContextProvider } from '../../context/context.js';
 import { NotFoundError } from '../../errors/not-found.error.js';
@@ -167,9 +167,11 @@ let EntityRepository = class EntityRepository {
         yield* entities;
     }
     async count() {
+        const sqlQuery = this.convertQuery({});
         const dbQuery = this.session
             .select({ count: count() })
-            .from(this.#table);
+            .from(this.#table)
+            .where(sqlQuery);
         const [result] = await dbQuery;
         return assertDefinedPass(result).count;
     }
@@ -194,9 +196,11 @@ let EntityRepository = class EntityRepository {
         return assertDefinedPass(result).exists;
     }
     async hasAll(ids) {
+        const sqlQuery = this.convertQuery({});
         const result = await this.session
             .select({ contains: sql `array_agg(${this.#table.id}) @> ${ids}`.as('contains') })
-            .from(this.#table);
+            .from(this.#table)
+            .where(sqlQuery);
         return assertDefinedPass(result[0]).contains;
     }
     /**
@@ -270,11 +274,12 @@ let EntityRepository = class EntityRepository {
         return entity;
     }
     async tryUpdate(id, update) {
+        const sqlQuery = this.convertQuery(eq(this.#table.id, id));
         const mappedUpdate = await this.mapUpdate(update);
         const [row] = await this.session
             .update(this.#table)
             .set(mappedUpdate)
-            .where(eq(this.#table.id, id))
+            .where(sqlQuery)
             .returning();
         if (isUndefined(row)) {
             return undefined;
@@ -325,13 +330,14 @@ let EntityRepository = class EntityRepository {
         if (!this.hasMetadata) {
             return this.tryHardDelete(id);
         }
+        const sqlQuery = this.convertQuery(eq(this.#table.id, id));
         const [row] = await this.session
             .update(this.#tableWithMetadata)
             .set({
             deleteTimestamp: TRANSACTION_TIMESTAMP,
             attributes: this.getAttributesUpdate(metadataUpdate?.attributes)
         })
-            .where(eq(this.#table.id, id))
+            .where(sqlQuery)
             .returning();
         if (isUndefined(row)) {
             return undefined;
@@ -389,9 +395,10 @@ let EntityRepository = class EntityRepository {
         return result;
     }
     async tryHardDelete(id) {
+        const sqlQuery = this.convertQuery(eq(this.#table.id, id));
         const [row] = await this.session
             .delete(this.#table)
-            .where(eq(this.#table.id, id))
+            .where(sqlQuery)
             .returning();
         if (isUndefined(row)) {
             return undefined;
@@ -453,8 +460,12 @@ let EntityRepository = class EntityRepository {
             return direction == 'asc' ? asc(column) : desc(column);
         });
     }
-    convertQuery(query) {
-        return convertQuery(query, this.#table, this.#columnDefinitionsMap);
+    convertQuery(query, options) {
+        let sql = convertQuery(query, this.#table, this.#columnDefinitionsMap);
+        if (!this.hasMetadata || (options?.withDeleted == true)) {
+            return sql;
+        }
+        return and(isNull(this.#tableWithMetadata.deleteTimestamp), sql);
     }
     async mapManyToEntity(columns) {
         const transformContext = await this.getTransformContext();

package/package.json

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