Skip to content

Commit dcde1f7

Browse files
committed
Bugfix: only ignore incoming values which are null/undefined
1 parent c7e1b9e commit dcde1f7

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

dist/vuex-orm-apollo.esm.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7840,25 +7840,27 @@ var QueryBuilder = /** @class */ (function () {
78407840
}
78417841
else {
78427842
Object.keys(data).forEach(function (key) {
7843-
if (data[key] instanceof Object) {
7844-
if (data[key].nodes) {
7845-
result[inflection.pluralize(key)] = _this.transformIncomingData(data[key].nodes, model, mutation, true);
7843+
if (data[key] !== undefined && data[key] !== null) {
7844+
if (data[key] instanceof Object) {
7845+
if (data[key].nodes) {
7846+
result[inflection.pluralize(key)] = _this.transformIncomingData(data[key].nodes, model, mutation, true);
7847+
}
7848+
else {
7849+
var newKey = key;
7850+
if (mutation && !recursiveCall) {
7851+
newKey = data[key].nodes ? model.pluralName : model.singularName;
7852+
newKey = downcaseFirstLetter(newKey);
7853+
}
7854+
result[newKey] = _this.transformIncomingData(data[key], model, mutation, true);
7855+
}
7856+
}
7857+
else if (key === 'id') {
7858+
result[key] = parseInt(data[key], 0);
78467859
}
78477860
else {
7848-
var newKey = key;
7849-
if (mutation && !recursiveCall) {
7850-
newKey = data[key].nodes ? model.pluralName : model.singularName;
7851-
newKey = downcaseFirstLetter(newKey);
7852-
}
7853-
result[newKey] = _this.transformIncomingData(data[key], model, mutation, true);
7861+
result[key] = data[key];
78547862
}
78557863
}
7856-
else if (key === 'id') {
7857-
result[key] = parseInt(data[key], 0);
7858-
}
7859-
else {
7860-
result[key] = data[key];
7861-
}
78627864
});
78637865
}
78647866
if (!recursiveCall) {

src/queryBuilder.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,23 +169,25 @@ export default class QueryBuilder {
169169
result = data.map(d => this.transformIncomingData(d, model, mutation, true));
170170
} else {
171171
Object.keys(data).forEach((key) => {
172-
if (data[key] instanceof Object) {
173-
if (data[key].nodes) {
174-
result[inflection.pluralize(key)] = this.transformIncomingData(data[key].nodes, model, mutation, true);
175-
} else {
176-
let newKey = key;
172+
if (data[key] !== undefined && data[key] !== null) {
173+
if (data[key] instanceof Object) {
174+
if (data[key].nodes) {
175+
result[inflection.pluralize(key)] = this.transformIncomingData(data[key].nodes, model, mutation, true);
176+
} else {
177+
let newKey = key;
177178

178-
if (mutation && !recursiveCall) {
179-
newKey = data[key].nodes ? model.pluralName : model.singularName;
180-
newKey = downcaseFirstLetter(newKey);
181-
}
179+
if (mutation && !recursiveCall) {
180+
newKey = data[key].nodes ? model.pluralName : model.singularName;
181+
newKey = downcaseFirstLetter(newKey);
182+
}
182183

183-
result[newKey] = this.transformIncomingData(data[key], model, mutation, true);
184+
result[newKey] = this.transformIncomingData(data[key], model, mutation, true);
185+
}
186+
} else if (key === 'id') {
187+
result[key] = parseInt(data[key], 0);
188+
} else {
189+
result[key] = data[key];
184190
}
185-
} else if (key === 'id') {
186-
result[key] = parseInt(data[key], 0);
187-
} else {
188-
result[key] = data[key];
189191
}
190192
});
191193
}

0 commit comments

Comments
 (0)