tspace-mysql 1.9.0-beta.3 → 1.9.0-beta.4

package/dist/lib/core/UtilityTypes.d.ts

@@ -154,7 +154,7 @@ export declare namespace T {
         [K in keyof SRS]: true;
     }, SR>> & TRepositoryPrimitiveExtendType<G>) extends infer $Resolved ? S extends undefined ? E extends undefined ? TDeepExpand<$Resolved> : TDeepExpand<TDeepOmit<$Resolved, E>> : TDeepExpand<$Resolved> : never;
     type PaginateResultFiltered<M extends Model, K = {}, S = undefined, SR = undefined, E = undefined, SRS = undefined> = TDeepExpand<TPagination<ResultFiltered<M, K, S, SR, E, SRS>>>;
-    type Result<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>> & {
+    type Result<M extends Model, K = {}> = TDeepExpand<TResultResolved<M> & K> & {
         [customKey: string]: unknown;
     };
     type PaginateResult<M extends Model, K = {}> = TDeepExpand<TPagination<Result<M, K>>>;
@@ -168,10 +168,16 @@ export declare namespace T {
         [P in Exclude<K & keyof C, "id" | "_id" | "uuid"> as null extends C[P] ? never : P]: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
     } & {
         [P in Exclude<K & keyof C, "id" | "_id" | "uuid"> as null extends C[P] ? P : never]?: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
+    } & {
+        [P in Extract<K & keyof C, "id" | "_id" | "uuid">]?: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
     };
     type UpdateInput<K, C> = {
-        [P in Exclude<K & keyof C, "id" | "_id" | "uuid">]?: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
-    };
+        [P in Exclude<K & keyof C, "id" | "_id">]: {
+            [Q in P]-?: Q extends "uuid" ? string : C[Q] extends Date ? any : C[Q] extends Record<string, unknown> ? string : C[Q];
+        } & {
+            [Q in Exclude<K & keyof C, "id" | "_id" | P>]?: Q extends "uuid" ? string : C[Q] extends Date ? any : C[Q] extends Record<string, unknown> ? string : C[Q];
+        };
+    }[Exclude<K & keyof C, "id" | "_id">];
     type NoConflict<R extends readonly PropertyKey[], O extends readonly PropertyKey[]> = TConflictKeys<R, O> extends never ? {} : {
         ERROR_DUPLICATE_KEYS: TConflictKeys<R, O>;
     };

package/dist/lib/core/UtilityTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"UtilityTypes.js","sourceRoot":"","sources":["../../../src/lib/core/UtilityTypes.ts"],"names":[],"mappings":";;AAodC,CAAC"}
+{"version":3,"file":"UtilityTypes.js","sourceRoot":"","sources":["../../../src/lib/core/UtilityTypes.ts"],"names":[],"mappings":";;AAmeC,CAAC"}

package/dist/lib/types/index.d.ts

@@ -361,7 +361,7 @@ export type TDeepOmit<T, Filter> = T extends infer ObjectType ? {
 export type TDeepExpand<T> = T extends Date ? T : T extends Function ? T : T extends Model ? T : T extends (infer U)[] ? TDeepExpand<U>[] : T extends object ? {
     [K in keyof T]: TDeepExpand<T[K]>;
 } : T;
-export type TResultResolved<M extends Model, K = {}> = (unknown extends TResult<M> ? unknown extends TResultDecorator<M> ? Record<K & string, any> : {} extends TResultDecorator<M> ? Record<K & string, any> : TResultDecorator<K & M> : TResult<K & M>);
+export type TResultResolved<M extends Model> = (unknown extends TResult<M> ? unknown extends TResultDecorator<M> ? Record<string, any> : {} extends TResultDecorator<M> ? Record<string, any> : TResultDecorator<M> : TResult<M>);
 export type TConflictKeys<R extends readonly PropertyKey[], O extends readonly PropertyKey[]> = Extract<R[number], O[number]>;
 type Normalize<T> = T extends object ? ((T extends {
     select: infer S;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.9.0-beta.3",
+  "version": "1.9.0-beta.4",
   "description": "Tspace MySQL is a promise-based ORM for Node.js, designed with modern TypeScript and providing type safety for schema databases.",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",