fix: don't set attributes if it's partial

Author: ProGM

dist/index.cjs.js

@@ -119,7 +119,7 @@ class Parser {
     }
     const loadedElement = Parser.load(element, included);
     const model = $registeredModels.find(e => e.type === loadedElement.type);
-    const instance = this.wrapWhenPartial(model, loadedElement);
+    const instance = this.wrapWhenPartial(new (model?.klass || Model)(), loadedElement);
     this.resolved[uniqueKey] = instance;
     if (model && model.createFn) {
       return model.createFn(instance, loadedElement, relation => this.parse(relation, included));
@@ -128,15 +128,17 @@ class Parser {
     const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     instance.id = loadedElement.id;
     instance._type = loadedElement.type;
+    if ('$_partial' in loadedElement) {
+      return instance;
+    }
     this.parseAttributes(instance, loadedElement, attrData);
     this.parseRelationships(instance, loadedElement, relsData, included);
     return instance;
   }
-  wrapWhenPartial(model, loadedElement) {
+  wrapWhenPartial(instance, loadedElement) {
     if (!loadedElement.$_partial) {
-      return new (model?.klass || Model)();
+      return instance;
     }
-    const instance = new Model();
     return new Proxy(instance, {
       get: function (target, prop) {
         if (prop === "$_partial") {

dist/index.esm.js

@@ -115,7 +115,7 @@ class Parser {
     }
     const loadedElement = Parser.load(element, included);
     const model = $registeredModels.find(e => e.type === loadedElement.type);
-    const instance = this.wrapWhenPartial(model, loadedElement);
+    const instance = this.wrapWhenPartial(new (model?.klass || Model)(), loadedElement);
     this.resolved[uniqueKey] = instance;
     if (model && model.createFn) {
       return model.createFn(instance, loadedElement, relation => this.parse(relation, included));
@@ -124,15 +124,17 @@ class Parser {
     const relsData = $registeredRelationships.find(e => e.klass === model?.klass);
     instance.id = loadedElement.id;
     instance._type = loadedElement.type;
+    if ('$_partial' in loadedElement) {
+      return instance;
+    }
     this.parseAttributes(instance, loadedElement, attrData);
     this.parseRelationships(instance, loadedElement, relsData, included);
     return instance;
   }
-  wrapWhenPartial(model, loadedElement) {
+  wrapWhenPartial(instance, loadedElement) {
     if (!loadedElement.$_partial) {
-      return new (model?.klass || Model)();
+      return instance;
     }
-    const instance = new Model();
     return new Proxy(instance, {
       get: function (target, prop) {
         if (prop === "$_partial") {

dist/types/Parser.d.ts

@@ -1,7 +1,6 @@
 import { JSONData } from "./interfaces/JSONData";
 import { JSONModel } from "./interfaces/JSONModel";
 import { Model } from "./Model";
-import { RegisteredModel } from "./interfaces/RegisteredModel";
 export declare class Parser {
     private data;
     private included;
@@ -11,7 +10,7 @@ export declare class Parser {
     private parse;
     parseList(list: JSONModel[], included: JSONModel[]): unknown[];
     parseElement<T>(element: JSONModel, included: JSONModel[]): T;
-    wrapWhenPartial(model: RegisteredModel | undefined, loadedElement: JSONModel & {
+    wrapWhenPartial(instance: Model, loadedElement: JSONModel & {
         $_partial?: boolean;
     }): Model;
     private parseRelationships;

src/Parser.ts

@@ -5,7 +5,6 @@ import { RegisteredProperty } from "./interfaces/RegisteredProperty";
 import { Model } from "./Model";
 import { $registeredAttributes, $registeredModels, $registeredRelationships } from "./data";
 import { debug } from "./utils";
-import { RegisteredModel } from "./interfaces/RegisteredModel";
 
 export class Parser {
   readonly resolved: Record<string, Model> = {};
@@ -63,7 +62,7 @@ export class Parser {
       (e) => e.type === loadedElement.type
     );
 
-    const instance = this.wrapWhenPartial(model, loadedElement);
+    const instance = this.wrapWhenPartial(new (model?.klass || Model)(), loadedElement);
     this.resolved[uniqueKey] = instance;
 
     if (model && model.createFn) {
@@ -80,17 +79,19 @@ export class Parser {
     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);
 
     return instance as T;
   }
 
-  wrapWhenPartial(model: RegisteredModel | undefined, loadedElement: JSONModel & { $_partial?: boolean }) {
+  wrapWhenPartial(instance: Model, loadedElement: JSONModel & { $_partial?: boolean }) {
     if (!loadedElement.$_partial) {
-      return new (model?.klass || Model)();
+      return instance;
     }
-    const instance = new Model();
     return new Proxy(
       instance,
       {

test/basic.spec.ts

@@ -115,7 +115,7 @@ test("logs undeclared attributes", () => {
 test("toJSON has a max depth", () => {
   const post = parsed[0];
   expect(JSON.stringify(post.toJSON(1))).toBe(`
-    {"id":"2","name":"My post","ciao":null,"content":"ciao","createdAt":"2020-10-10T10:32:00.000Z","enabled":true,"author":{"id":"3","firstName":"Gino","lastName":"Pino","createdAt":"2020-10-15T10:32:00.000Z"},"reviewer":null,"relatedPost":{"id":"10","enabled":true}}
+    {"id":"2","name":"My post","ciao":null,"content":"ciao","createdAt":"2020-10-10T10:32:00.000Z","enabled":true,"author":{"id":"3","firstName":"Gino","lastName":"Pino","createdAt":"2020-10-15T10:32:00.000Z"},"reviewer":null,"relatedPost":{"id":"10"}}
   `.trim());
 });