@koalarx/nest 3.1.36 → 3.1.37

package/core/database/entity.base.js

@@ -17,6 +17,38 @@ class EntityBase {
     _action = EntityActionType.create;
     _hasUpdate = false;
     constructor(props) {
+        Object.defineProperties(this, {
+            _trackHasUpdateOnSet: {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: false,
+            },
+            _setTrackingProxy: {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: undefined,
+            },
+            _id: {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: this._id,
+            },
+            _action: {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: this._action,
+            },
+            _hasUpdate: {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: this._hasUpdate,
+            },
+        });
         if (props) {
             this.automap(props);
         }
@@ -37,6 +69,8 @@ class EntityBase {
                 if (success &&
                     target._trackHasUpdateOnSet &&
                     property !== '_hasUpdate' &&
+                    property !== '_action' &&
+                    property !== '_id' &&
                     property !== '_trackHasUpdateOnSet' &&
                     property !== '_setTrackingProxy') {
                     target._hasUpdate = true;

package/core/database/entity.decorator.d.ts

@@ -8,5 +8,5 @@ export interface IdConfig<T extends EntityProps<any>> {
     composite?: readonly (keyof T)[];
     custom?: (props: T) => string | number | CompositeId;
 }
-export declare function Entity<T extends new (...args: any[]) => EntityBase<any>>(id?: keyof EntityProps<InstanceType<T>> | IdConfig<EntityProps<InstanceType<T>>>): (target: T) => T;
+export declare function Entity(id?: keyof EntityProps<any> | IdConfig<EntityProps<any>>): <T extends new (...args: any[]) => EntityBase<any>>(target: T) => T;
 export {};

package/core/database/entity.decorator.js

@@ -30,6 +30,8 @@ function Entity(id) {
         });
         const idConfig = normalizeIdConfig(id);
         Reflect.defineMetadata('entity:id', idConfig, NewConstructor.prototype);
+        Reflect.defineMetadata('entity:decorated-constructor', NewConstructor, target.prototype);
+        Reflect.defineMetadata('entity:decorated-constructor', NewConstructor, NewConstructor.prototype);
         return NewConstructor;
     };
 }

package/core/database/repository.base.js

@@ -285,8 +285,15 @@ class RepositoryBase {
     }
     createEntity(data, entityClass) {
         const entity = new (entityClass || this._modelName)();
+        const trackedEntity = entity;
+        if (typeof trackedEntity.stopHasUpdateTracking === 'function') {
+            trackedEntity.stopHasUpdateTracking();
+        }
         entity._action = entity_base_1.EntityActionType.update;
         entity.automap(data);
+        if (typeof trackedEntity.startHasUpdateTracking === 'function') {
+            trackedEntity.startHasUpdateTracking();
+        }
         return entity;
     }
     orphanRemoval(client, entity) {

package/core/utils/automap-cycle-context.js

@@ -15,12 +15,19 @@ function mapEntityReference(value, EntityOnPropKey, context, action) {
     if (cachedEntity) {
         return cachedEntity;
     }
-    const entity = new EntityOnPropKey();
+    const DecoratedEntityConstructor = Reflect.getMetadata('entity:decorated-constructor', EntityOnPropKey.prototype) ?? EntityOnPropKey;
+    const entity = new DecoratedEntityConstructor();
+    const trackedEntity = entity;
     if (entity && typeof entity.automap === 'function') {
-        ;
-        entity._action = action;
+        if (typeof trackedEntity.stopHasUpdateTracking === 'function') {
+            trackedEntity.stopHasUpdateTracking();
+        }
+        trackedEntity._action = action;
         context.references.set(value, entity);
-        entity.automap(value, context);
+        trackedEntity.automap(value, context);
+        if (typeof trackedEntity.startHasUpdateTracking === 'function') {
+            trackedEntity.startHasUpdateTracking();
+        }
     }
     return entity;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "3.1.36",
+  "version": "3.1.37",
   "description": "",
   "author": "Igor D. Rangel",
   "license": "MIT",