@tstdl/base 0.92.49 → 0.92.50

package/orm/server/repository.d.ts

@@ -12,7 +12,7 @@ import { type Transaction, type TransactionConfig } from './transaction.js';
 type PgTransaction = DrizzlePgTransaction<PgQueryResultHKT, Record, Record>;
 export declare const repositoryType: unique symbol;
 export type OrderOptions<T extends Entity> = {
-    order?: Partial<Record<Paths<T>, 1 | -1 | 'asc' | 'desc'>>;
+    order?: Partial<Record<Paths<UntaggedDeep<T>>, 1 | -1 | 'asc' | 'desc'>>;
 };
 export type LoadOptions<T extends Entity> = OrderOptions<T> & {
     offset?: number;
@@ -63,8 +63,8 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     hasAll(ids: string[]): Promise<boolean>;
     insert(entity: NewEntity<T>): Promise<T>;
     insertMany(entities: NewEntity<T>[]): Promise<T[]>;
-    upsert(target: OneOrMany<Extract<keyof T, string>>, entity: NewEntity<T>, update?: EntityUpdate<T>): Promise<T>;
-    upsertMany(target: OneOrMany<Extract<keyof T, string>>, entities: NewEntity<T>[], update: EntityUpdate<T>): Promise<T[]>;
+    upsert(target: OneOrMany<Paths<UntaggedDeep<T>>>, entity: NewEntity<T>, update?: EntityUpdate<T>): Promise<T>;
+    upsertMany(target: OneOrMany<Paths<UntaggedDeep<T>>>, entities: NewEntity<T>[], update: EntityUpdate<T>): Promise<T[]>;
     update(id: string, update: EntityUpdate<T>): Promise<T>;
     tryUpdate(id: string, update: EntityUpdate<T>): Promise<T | undefined>;
     updateByQuery(query: Query<T>, update: EntityUpdate<T>): Promise<T>;

package/package.json

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

package/types/tagged.d.ts

@@ -11,6 +11,6 @@ export type Tagged<Type = unknown, TagName extends PropertyKey = PropertyKey, Ta
 export type GetTagMetadata<Type extends Tag<unknown, TagName, unknown>, TagName extends PropertyKey> = NonNullable<Type[typeof tag]>[TagName];
 export type UnwrapTagged<TaggedType extends Tag<unknown, PropertyKey, any>> = TaggedType extends Tagged<infer Type, PropertyKey, any> ? Type : never;
 export type Untagged<T> = T extends Tagged ? UnwrapTagged<T> : T;
-export type UntaggedDeep<T> = T extends Tagged ? UnwrapTagged<T> : T extends readonly (infer U)[] ? UntaggedDeep<U>[] : T extends Record ? {
-    [P in keyof T]: UntaggedDeep<T[P]>;
+export type UntaggedDeep<T> = Untagged<T> extends any[] | Record ? {
+    [P in keyof Untagged<T>]: UntaggedDeep<Untagged<T>[P]>;
 } : Untagged<T>;

package/types.d.ts

@@ -190,7 +190,7 @@ export type DeepPartialArray<T> = DeepPartial<T>[];
 export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array | BigInt64Array | BigUint64Array;
 export type BinaryData = ArrayBuffer | ArrayBufferView;
 export type Paths<T extends Record> = T extends object ? {
-    [K in keyof T]-?: K extends string | number ? K | `${K}.${Paths<T[K]>}` : never;
+    [K in keyof T]-?: K extends string | number ? `${K}` | `${K}.${Paths<T[K]>}` : never;
 }[keyof T] : never;
 export type TypeFromPath<T extends Record, Path extends Paths<T> | string> = {
     [K in Path]: K extends keyof T ? T[K] : K extends `${infer P}.${infer S}` ? T[P] extends Record ? TypeFromPath<T[P], S> : never : never;