Bugfix: don't skip incoming fields which are null or false

phortx · phortx · commit fb4e68ddb51d · 2018-05-03T17:04:00.000+02:00
diff --git a/dist/vuex-orm-apollo.esm.js b/dist/vuex-orm-apollo.esm.js
@@ -7840,27 +7840,25 @@ var QueryBuilder = /** @class */ (function () {
         }
         else {
             Object.keys(data).forEach(function (key) {
-                if (data[key]) {
-                    if (data[key] instanceof Object) {
-                        if (data[key].nodes) {
-                            result[inflection.pluralize(key)] = _this.transformIncomingData(data[key].nodes, model, mutation, true);
-                        }
-                        else {
-                            var newKey = key;
-                            if (mutation && !recursiveCall) {
-                                newKey = data[key].nodes ? model.pluralName : model.singularName;
-                                newKey = downcaseFirstLetter(newKey);
-                            }
-                            result[newKey] = _this.transformIncomingData(data[key], model, mutation, true);
-                        }
-                    }
-                    else if (key === 'id') {
-                        result[key] = parseInt(data[key], 0);
+                if (data[key] instanceof Object) {
+                    if (data[key].nodes) {
+                        result[inflection.pluralize(key)] = _this.transformIncomingData(data[key].nodes, model, mutation, true);
                     }
                     else {
-                        result[key] = data[key];
+                        var newKey = key;
+                        if (mutation && !recursiveCall) {
+                            newKey = data[key].nodes ? model.pluralName : model.singularName;
+                            newKey = downcaseFirstLetter(newKey);
+                        }
+                        result[newKey] = _this.transformIncomingData(data[key], model, mutation, true);
                     }
                 }
+                else if (key === 'id') {
+                    result[key] = parseInt(data[key], 0);
+                }
+                else {
+                    result[key] = data[key];
+                }
             });
         }
         if (!recursiveCall) {
diff --git a/src/queryBuilder.ts b/src/queryBuilder.ts
@@ -169,25 +169,23 @@ export default class QueryBuilder {
       result = data.map(d => this.transformIncomingData(d, model, mutation, true));
     } else {
       Object.keys(data).forEach((key) => {
-        if (data[key]) {
-          if (data[key] instanceof Object) {
-            if (data[key].nodes) {
-              result[inflection.pluralize(key)] = this.transformIncomingData(data[key].nodes, model, mutation, true);
-            } else {
-              let newKey = key;
-
-              if (mutation && !recursiveCall) {
-                newKey = data[key].nodes ? model.pluralName : model.singularName;
-                newKey = downcaseFirstLetter(newKey);
-              }
+        if (data[key] instanceof Object) {
+          if (data[key].nodes) {
+            result[inflection.pluralize(key)] = this.transformIncomingData(data[key].nodes, model, mutation, true);
+          } else {
+            let newKey = key;
 
-              result[newKey] = this.transformIncomingData(data[key], model, mutation, true);
+            if (mutation && !recursiveCall) {
+              newKey = data[key].nodes ? model.pluralName : model.singularName;
+              newKey = downcaseFirstLetter(newKey);
             }
-          } else if (key === 'id') {
-            result[key] = parseInt(data[key], 0);
-          } else {
-            result[key] = data[key];
+
+            result[newKey] = this.transformIncomingData(data[key], model, mutation, true);
           }
+        } else if (key === 'id') {
+          result[key] = parseInt(data[key], 0);
+        } else {
+          result[key] = data[key];
         }
       });
     }
diff --git a/test/unit/QueryBuilder.spec.js b/test/unit/QueryBuilder.spec.js
@@ -182,6 +182,7 @@ describe('QueryBuilder', () => {
               "name": "Contract S",
               "displayName": "Contract S",
               "slug": "contract-s",
+              "checked": false,
               "contractOptions": {
                 "nodes": [
                   {
@@ -197,6 +198,7 @@ describe('QueryBuilder', () => {
               "name": "Contract M",
               "displayName": "Contract M",
               "slug": "contract-m",
+              "checked": true,
               "contractOptions": {
                 "nodes": [
                   {
@@ -212,6 +214,7 @@ describe('QueryBuilder', () => {
               "name": "Contract L",
               "displayName": "Contract L",
               "slug": "contract-l",
+              "checked": false,
               "contractOptions": {
                 "nodes": [
                   {
@@ -229,6 +232,7 @@ describe('QueryBuilder', () => {
         "contracts": [
           {
             "$isPersisted": true,
+            "checked": false,
             "contractOptions": [
               {
                 "$isPersisted": true,
@@ -244,6 +248,7 @@ describe('QueryBuilder', () => {
           },
           {
             "$isPersisted": true,
+            "checked": true,
             "contractOptions": [
               {
                 "$isPersisted": true,
@@ -259,6 +264,7 @@ describe('QueryBuilder', () => {
           },
           {
             "$isPersisted": true,
+            "checked": false,
             "contractOptions": [
               {
                 "$isPersisted": true,

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ describe('QueryBuilder', () => {`
`182`	`182`	`"name": "Contract S",`
`183`	`183`	`"displayName": "Contract S",`
`184`	`184`	`"slug": "contract-s",`
	`185`	`+ "checked": false,`
`185`	`186`	`"contractOptions": {`
`186`	`187`	`"nodes": [`
`187`	`188`	`{`
`@@ -197,6 +198,7 @@ describe('QueryBuilder', () => {`
`197`	`198`	`"name": "Contract M",`
`198`	`199`	`"displayName": "Contract M",`
`199`	`200`	`"slug": "contract-m",`
	`201`	`+ "checked": true,`
`200`	`202`	`"contractOptions": {`
`201`	`203`	`"nodes": [`
`202`	`204`	`{`
`@@ -212,6 +214,7 @@ describe('QueryBuilder', () => {`
`212`	`214`	`"name": "Contract L",`
`213`	`215`	`"displayName": "Contract L",`
`214`	`216`	`"slug": "contract-l",`
	`217`	`+ "checked": false,`
`215`	`218`	`"contractOptions": {`
`216`	`219`	`"nodes": [`
`217`	`220`	`{`
`@@ -229,6 +232,7 @@ describe('QueryBuilder', () => {`
`229`	`232`	`"contracts": [`
`230`	`233`	`{`
`231`	`234`	`"$isPersisted": true,`
	`235`	`+ "checked": false,`
`232`	`236`	`"contractOptions": [`
`233`	`237`	`{`
`234`	`238`	`"$isPersisted": true,`
`@@ -244,6 +248,7 @@ describe('QueryBuilder', () => {`
`244`	`248`	`},`
`245`	`249`	`{`
`246`	`250`	`"$isPersisted": true,`
	`251`	`+ "checked": true,`
`247`	`252`	`"contractOptions": [`
`248`	`253`	`{`
`249`	`254`	`"$isPersisted": true,`
`@@ -259,6 +264,7 @@ describe('QueryBuilder', () => {`
`259`	`264`	`},`
`260`	`265`	`{`
`261`	`266`	`"$isPersisted": true,`
	`267`	`+ "checked": false,`
`262`	`268`	`"contractOptions": [`
`263`	`269`	`{`
`264`	`270`	`"$isPersisted": true,`