fix: broken assignment

Author: ProGM

dist/index.cjs.js

@@ -124,13 +124,13 @@ class Parser {
     if (model && model.createFn) {
       return model.createFn(instance, loadedElement, relation => this.parse(relation, included));
     }
-    const attrData = $registeredAttributes.find(e => e.klass === model?.klass);
-    const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     instance.id = loadedElement.id;
     instance._type = loadedElement.type;
     if ('$_partial' in loadedElement) {
       return instance;
     }
+    const attrData = $registeredAttributes.find(e => e.klass === model?.klass);
+    const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     this.parseAttributes(instance, loadedElement, attrData);
     this.parseRelationships(instance, loadedElement, relsData, included);
     return instance;
@@ -144,6 +144,9 @@ class Parser {
         if (prop === "$_partial") {
           return true;
         }
+        if (prop in target) {
+          return target[prop];
+        }
         const propString = prop.toString();
         debug('error', `Trying to call property "${propString}" to a model that is not included. Add "${loadedElement.type}" to included models.`, {
           model: instance,

dist/index.esm.js

@@ -120,13 +120,13 @@ class Parser {
     if (model && model.createFn) {
       return model.createFn(instance, loadedElement, relation => this.parse(relation, included));
     }
-    const attrData = $registeredAttributes.find(e => e.klass === model?.klass);
-    const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     instance.id = loadedElement.id;
     instance._type = loadedElement.type;
     if ('$_partial' in loadedElement) {
       return instance;
     }
+    const attrData = $registeredAttributes.find(e => e.klass === model?.klass);
+    const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     this.parseAttributes(instance, loadedElement, attrData);
     this.parseRelationships(instance, loadedElement, relsData, included);
     return instance;
@@ -140,6 +140,9 @@ class Parser {
         if (prop === "$_partial") {
           return true;
         }
+        if (prop in target) {
+          return target[prop];
+        }
         const propString = prop.toString();
         debug('error', `Trying to call property "${propString}" to a model that is not included. Add "${loadedElement.type}" to included models.`, {
           model: instance,

src/Parser.ts

@@ -69,19 +69,20 @@ export class Parser {
       return model.createFn(instance, loadedElement, (relation) => this.parse(relation, included)) as T;
     }
 
+    instance.id = loadedElement.id;
+    instance._type = loadedElement.type;
+
+    if ('$_partial' in loadedElement) {
+      return instance as T;
+    }
+
     const attrData = $registeredAttributes.find(
       (e) => e.klass === model?.klass
     );
     const relsData = $registeredRelationships.find(
       (e) => e.klass === model?.klass
     );
 
-    instance.id = loadedElement.id;
-    instance._type = loadedElement.type;
-
-    if ('$_partial' in loadedElement) {
-      return instance as T;
-    }
     this.parseAttributes(instance, loadedElement, attrData);
     this.parseRelationships(instance, loadedElement, relsData, included);
 
@@ -99,6 +100,9 @@ export class Parser {
           if (prop === "$_partial") {
             return true;
           }
+          if (prop in target) {
+            return target[prop];
+          }
           const propString = prop.toString();
           debug('error', `Trying to call property "${propString}" to a model that is not included. Add "${loadedElement.type}" to included models.`, {
             model: instance,