@tstdl/base 0.92.89 → 0.92.91

package/orm/query.d.ts

@@ -1,12 +1,12 @@
 import type { SQLWrapper } from 'drizzle-orm';
 import type { Flatten, Record } from '../types.js';
 import type { Geometry } from '../types/geo-json.js';
-import type { Untagged } from '../types/tagged.js';
+import type { UntaggedDeep } from '../types/tagged.js';
 export type LogicalQuery<T = any> = LogicalAndQuery<T> | LogicalOrQuery<T> | LogicalNorQuery<T>;
 export type LogicalQueryTypes = keyof (LogicalAndQuery & LogicalOrQuery & LogicalNorQuery);
 export declare const allLogicalQueryTypes: LogicalQueryTypes[];
 export type ComparisonQueryBody<T = any> = {
-    [P in keyof T]?: ComparisonQueryOrValue<T[P]>;
+    [P in keyof T]?: T[P] extends Record ? ComparisonQueryBody<T[P]> : ComparisonQueryOrValue<T[P]>;
 } & Record<ComparisonQueryOrValue>;
 export type ComparisonQueryOrValue<T = any> = ComparisonQuery<T> | ComparisonValue<T>;
 export type ComparisonQuery<T = any> = Partial<ComparisonNotQuery<T> & ComparisonEqualsQuery<T> & ComparisonNotEqualsQuery<T> & ComparisonExistsQuery & ComparisonItemQuery<T> & ComparisonInQuery<T> & ComparisonNotInQuery<T> & ComparisonAllQuery<T> & ComparisonGreaterThanQuery<T> & ComparisonGreaterThanOrEqualsQuery<T> & ComparisonLessThanQuery<T> & ComparisonLessThanOrEqualsQuery<T> & ComparisonRegexQuery & ComparisonTextQuery & ComparisonGeoShapeQuery & ComparisonGeoDistanceQuery>;
@@ -15,7 +15,7 @@ export declare const allComparisonQueryTypes: ComparisonQueryTypes[];
 export type SpecialQuery<T = any> = Partial<TextSpanQuery<T>>;
 export type SpecialQueryTypes = keyof SpecialQuery;
 export declare const allSpecialQueryTypes: SpecialQueryTypes[];
-export type Query<T = any> = SQLWrapper | QueryObject<T>;
+export type Query<T = any> = SQLWrapper | QueryObject<UntaggedDeep<T>>;
 export type QueryObject<T> = LogicalQuery<T> | (ComparisonQueryBody<T> & SpecialQuery<T>);
 export type QueryTypes = LogicalQueryTypes | ComparisonQueryTypes | SpecialQueryTypes;
 export declare const allQueryTypes: ("$and" | "$or" | "$nor" | "$not" | "$eq" | "$neq" | "$exists" | "$item" | "$in" | "$nin" | "$all" | "$gt" | "$gte" | "$lt" | "$lte" | "$regex" | "$text" | "$geoShape" | "$geoDistance" | "$textSpan")[];
@@ -30,7 +30,7 @@ export type LogicalOrQuery<T = any> = {
 export type LogicalNorQuery<T = any> = {
     $nor: readonly Query<T>[];
 };
-export type ComparisonValue<T> = Untagged<T | Flatten<T>> | SQLWrapper;
+export type ComparisonValue<T> = T | Flatten<T> | SQLWrapper;
 export type ComparisonValueWithRegex<T> = T extends string ? ComparisonValue<T | RegExp> : T extends readonly string[] ? ComparisonValue<readonly (Flatten<T> | RegExp)[]> : (T | Flatten<T>);
 export type ComparisonNotQuery<T = any> = {
     $not: ComparisonQuery<T>;

package/orm/server/repository.d.ts

@@ -14,7 +14,7 @@ export declare const repositoryType: unique symbol;
 export declare class EntityRepositoryConfig {
     schema: string;
 }
-export type TransactionHandler<T extends EntityWithoutMetadata, R> = (repository: EntityRepository<T>, transaction: Transaction) => Promise<R>;
+export type TransactionHandler<T extends EntityRepository<any>, R> = (repository: T, transaction: Transaction) => Promise<R>;
 type InferSelect<T extends Entity | EntityWithoutMetadata = Entity | EntityWithoutMetadata> = PgTableFromType<EntityType<T>>['$inferSelect'];
 export declare class EntityRepository<T extends Entity | EntityWithoutMetadata = EntityWithoutMetadata> implements Resolvable<EntityType<T>> {
     #private;
@@ -27,11 +27,11 @@ export declare class EntityRepository<T extends Entity | EntityWithoutMetadata =
     protected get isFork(): boolean;
     readonly [resolveArgumentType]: EntityType<T>;
     constructor();
-    withOptionalTransaction(transaction: Transaction | undefined): EntityRepository<T>;
-    withTransaction(transaction: Transaction): EntityRepository<T>;
+    withOptionalTransaction(transaction: Transaction | undefined): this;
+    withTransaction(transaction: Transaction): this;
     startTransaction(config?: TransactionConfig): Promise<Transaction>;
-    useTransaction<R>(transaction: Transaction | undefined, handler: TransactionHandler<T, R>): Promise<R>;
-    transaction<R>(handler: TransactionHandler<T, R>, config?: TransactionConfig): Promise<R>;
+    useTransaction<R>(transaction: Transaction | undefined, handler: TransactionHandler<this, R>): Promise<R>;
+    transaction<R>(handler: TransactionHandler<this, R>, config?: TransactionConfig): Promise<R>;
     load(id: string): Promise<T>;
     tryLoad(id: string): Promise<T | undefined>;
     loadByQuery(query: Query<T>, options?: LoadOptions<T>): Promise<T>;
@@ -75,8 +75,8 @@ export declare class EntityRepository<T extends Entity | EntityWithoutMetadata =
     tryHardDeleteByQuery(query: Query<T>): Promise<T | undefined>;
     hardDeleteMany(ids: string[]): Promise<T[]>;
     hardDeleteManyByQuery(query: Query<T>): Promise<T[]>;
-    $getColumn(pathOrColumn: Paths<UntaggedDeep<T>> | ColumnDefinition): PgColumn;
-    $convertOrderBy(orderBy: Order<T>): SQL<unknown>[];
+    getColumn(pathOrColumn: Paths<UntaggedDeep<T>> | ColumnDefinition): PgColumn;
+    convertOrderBy(orderBy: Order<T>): SQL<unknown>[];
     convertQuery(query: Query<T>): SQL;
     mapManyToEntity(columns: InferSelect[]): Promise<T[]>;
     mapToEntity(columns: InferSelect): Promise<T>;

package/orm/server/repository.js

@@ -125,7 +125,7 @@ let EntityRepository = class EntityRepository {
             .offset(options?.offset)
             .$dynamic();
         if (isDefined(options?.order)) {
-            dbQuery = dbQuery.orderBy(...this.$convertOrderBy(options.order));
+            dbQuery = dbQuery.orderBy(...this.convertOrderBy(options.order));
         }
         const [row] = await dbQuery;
         if (isUndefined(row)) {
@@ -150,7 +150,7 @@ let EntityRepository = class EntityRepository {
             .limit(options?.limit)
             .$dynamic();
         if (isDefined(options?.order)) {
-            dbQuery = dbQuery.orderBy(...this.$convertOrderBy(options.order));
+            dbQuery = dbQuery.orderBy(...this.convertOrderBy(options.order));
         }
         const rows = await dbQuery;
         return this.mapManyToEntity(rows);
@@ -230,7 +230,7 @@ let EntityRepository = class EntityRepository {
         return this.mapManyToEntity(rows);
     }
     async upsert(target, entity, update) {
-        const targetColumns = toArray(target).map((path) => this.$getColumn(path));
+        const targetColumns = toArray(target).map((path) => this.getColumn(path));
         const columns = await this.mapToInsertColumns(entity);
         const mappedUpdate = await this.mapUpdate(update ?? entity);
         const [row] = await this.session
@@ -244,12 +244,12 @@ let EntityRepository = class EntityRepository {
         return this.mapToEntity(row);
     }
     async upsertMany(target, entities, update) {
-        const targetColumns = toArray(target).map((path) => this.$getColumn(path));
+        const targetColumns = toArray(target).map((path) => this.getColumn(path));
         const columns = await this.mapManyToInsertColumns(entities);
         const mappedUpdate = isDefined(update)
             ? await this.mapUpdate(update)
             : {
-                ...fromEntries(this.#columnDefinitions.map((column) => [column.name, sql `excluded.${sql.identifier(this.$getColumn(column).name)}`])),
+                ...fromEntries(this.#columnDefinitions.map((column) => [column.name, sql `excluded.${sql.identifier(this.getColumn(column).name)}`])),
                 ...this._getMetadataUpdate(update)
             };
         const rows = await this.session
@@ -427,26 +427,26 @@ let EntityRepository = class EntityRepository {
             .returning();
         return this.mapManyToEntity(rows);
     }
-    $getColumn(pathOrColumn) {
+    getColumn(pathOrColumn) {
         if (isString(pathOrColumn)) {
             const columnName = assertDefinedPass(this.#columnDefinitionsMap.get(pathOrColumn), `Could not map ${pathOrColumn} to column.`).name;
             return this.#table[columnName];
         }
         return this.#table[pathOrColumn.name];
     }
-    $convertOrderBy(orderBy) {
+    convertOrderBy(orderBy) {
         if (isArray(orderBy)) {
             return orderBy.map((item) => {
                 const itemIsArray = isArray(item);
                 const target = itemIsArray ? item[0] : item;
-                const column = isSQLWrapper(target) ? target : this.$getColumn(target);
+                const column = isSQLWrapper(target) ? target : this.getColumn(target);
                 const direction = itemIsArray ? item[1] : 'asc';
                 return direction == 'asc' ? asc(column) : desc(column);
             });
         }
         return objectEntries(orderBy)
             .map(([path, direction]) => {
-            const column = this.$getColumn(path);
+            const column = this.getColumn(path);
             return direction == 'asc' ? asc(column) : desc(column);
         });
     }

package/package.json

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