Resolved entity type when extend is present was reworked to present some weird behavior with Omit

Author: fabiosenracorrea

changelog.md

@@ -1,5 +1,9 @@
 # DynamoDB Provider Changelog
 
+## v1.1.2
+
+- **Type Enhance**: Resolved entity type when `extend` is present was reworked to present some weird behavior with `Omit`
+
 ## v1.1.1
 
 - **Fix**: Type for `ExtendableSingleTableEntity` adjusted based on new conditional `parser` property

package.json

@@ -2,7 +2,7 @@
   "homepage": "https://github.com/fabiosenracorrea/dynamodb-provider",
   "author": "fabiosenracorrea",
   "name": "dynamodb-provider",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A dynamodb Provider that simplifies the native api. It packs with a Single Table adaptor/pseudo ORM for single table design",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",

src/singleTable/model/definitions/entity/parsers.ts

@@ -1,4 +1,4 @@
-import { AnyFunction, AnyObject } from 'types';
+import { AnyFunction, AnyObject, IsNever, PrettifyObject } from 'types';
 
 export type EntityParseParams<Entity extends AnyObject> = {
   /**
@@ -14,12 +14,16 @@ export type EntityParseParams<Entity extends AnyObject> = {
   extend?: (entity: Entity) => AnyObject;
 };
 
+type Extended<Entity extends AnyObject, ExtendResult> = PrettifyObject<
+  IsNever<Extract<keyof Entity, keyof ExtendResult>> extends true
+    ? Entity & ExtendResult
+    : Omit<Entity, Extract<keyof Entity, keyof ExtendResult>> & ExtendResult
+>;
+
 export type ResolvedEntity<
   Entity extends AnyObject,
   Params extends EntityParseParams<Entity>,
-> = Params['extend'] extends AnyFunction
-  ? Omit<Entity, keyof ReturnType<Params['extend']>> & ReturnType<Params['extend']>
-  : Entity;
+> = Params['extend'] extends AnyFunction ? Extended<Entity, ReturnType<Params['extend']>> : Entity;
 
 export type EntityParser<E extends AnyObject, Parsers extends EntityParseParams<E>> = (
   entity: E,