Skip to content
This repository has been archived by the owner on Jun 27, 2018. It is now read-only.

#57 Fix for..in bug, add tests to guard against regressions. #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/DataStore/DataStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ class DataStore {

fillReferencesValuesFromEntry(entry, referencedValues, fillSimpleReference) {
for (let referenceField in referencedValues) {
if (!referencedValues.hasOwnProperty(referenceField)) continue;
let reference = referencedValues[referenceField],
choices = this.getReferenceChoicesById(reference),
entries = [],
identifier = reference.getMappedValue(entry.values[referenceField], entry.values);

if (reference.type() === 'reference_many') {
for (let i in identifier) {
if (!identifier.hasOwnProperty(i)) continue;
let id = identifier[i];
entries.push(choices[id]);
}
Expand Down
2 changes: 2 additions & 0 deletions lib/Field/Field.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ class Field {

getMappedValue(value, entry) {
for (let i in this._maps) {
if (!this._maps.hasOwnProperty(i)) continue;
value = this._maps[i](value, entry);
}

Expand Down Expand Up @@ -126,6 +127,7 @@ class Field {

getTransformedValue(value, entry) {
for (let i in this._transforms) {
if (!this._transforms.hasOwnProperty(i)) continue;
value = this._transforms[i](value, entry);
}

Expand Down
1 change: 1 addition & 0 deletions lib/Field/ReferenceField.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class ReferenceField extends Field {

if (identifier instanceof Array) {
for (let j in identifier) {
if (!identifier.hasOwnProperty(j)) continue;
results[identifier[j]] = true;
}
continue;
Expand Down
12 changes: 11 additions & 1 deletion lib/Queries/ReadQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ class ReadQueries extends Queries {
let data = {};
let name;
for (name in results[0]) {
if (!results[0].hasOwnProperty(name)) continue;
data[name] = results[0][name];
}
for (name in results[1]) {
if (!results[1].hasOwnProperty(name)) continue;
data[name] = results[1][name];
}
return data;
Expand All @@ -152,11 +154,13 @@ class ReadQueries extends Queries {
calls = [];

for (let i in references) {
if (!references.hasOwnProperty(i)) continue;
let reference = references[i],
targetEntity = reference.targetEntity(),
identifiers = reference.getIdentifierValues(rawValues);

for (let k in identifiers) {
if (!identifiers.hasOwnProperty(k)) continue;
calls.push(getOne(targetEntity, 'listView', identifiers[k], reference.name()));
}
}
Expand All @@ -182,6 +186,7 @@ class ReadQueries extends Queries {
calls = [];

for (let i in references) {
if (!references.hasOwnProperty(i)) continue;
let reference = references[i],
targetEntity = reference.targetEntity(),
identifiers = reference.getIdentifierValues(rawValues);
Expand Down Expand Up @@ -211,6 +216,7 @@ class ReadQueries extends Queries {
getRawValues = this.getRawValues.bind(this);

for (let i in references) {
if (!references.hasOwnProperty(i)) continue;
let reference = references[i];
let targetEntity = reference.targetEntity();

Expand Down Expand Up @@ -274,6 +280,7 @@ class ReadQueries extends Queries {
i = 0;

for (let j in references) {
if (!references.hasOwnProperty(j)) continue;
let reference = references[j],
response = responses[i++];

Expand Down Expand Up @@ -310,11 +317,12 @@ class ReadQueries extends Queries {
i = 0;

for (let j in references) {
if (!references.hasOwnProperty(j)) continue;
let data = [],
reference = references[j],
identifiers = reference.getIdentifierValues(rawValues);

for (let k in identifiers) {
for (let k of identifiers) {
response = responses[i++];
if (response.status == 'error') {
// one of the responses failed
Expand Down Expand Up @@ -349,6 +357,7 @@ class ReadQueries extends Queries {
calls = [];

for (let i in referencedLists) {
if (!referencedLists.hasOwnProperty(i)) continue;
let referencedList = referencedLists[i],
targetEntity = referencedList.targetEntity(),
viewName = referencedList.datagridName(),
Expand Down Expand Up @@ -376,6 +385,7 @@ class ReadQueries extends Queries {
entries = {};

for (let i in referencedLists) {
if (!referencedLists.hasOwnProperty(i)) continue;
let response = responses[j++];
if (response.status == 'error') {
// If a response fail, skip it
Expand Down
1 change: 1 addition & 0 deletions lib/Utils/PromisesResolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class PromisesResolver {
states[key] = true;
results[key] = result; // result may be an error
for (let i in states) {
if (!states.hasOwnProperty(i)) continue;
if (!states[i]) {
return;
}
Expand Down
1 change: 1 addition & 0 deletions lib/Utils/orderElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export default {
objectKey;

for (objectKey in input) {
if (!input.hasOwnProperty(objectKey)) continue;
results.push(input[objectKey]);
}

Expand Down
1 change: 1 addition & 0 deletions lib/View/View.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class View {
console.warn('Passing literal of Field to fields method is deprecated use array instead');
let result = [];
for (let fieldName in arg) {
if (!arg.hasOwnProperty(fieldName)) continue;
result = result.concat(View.flatten(arg[fieldName]));
}
return result;
Expand Down
18 changes: 18 additions & 0 deletions tests/before_all.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

beforeEach(function() {
if (!Object.prototype.test_prototype_entry) {
Object.prototype.test_prototype_entry =
"Don't use for..in to enumerate Object properties, as users are free to " +
"add entries to the Object prototype, for example for polyfills. " +
"You should instead use\n" +
" for (let i in xs) { if (!xs.hasOwnProperty(i)) continue; var x = xs[i]; ... }";
}

if (!Array.prototype.test_prototype_entry) {
Array.prototype.test_prototype_entry =
"Don't use for..in to enumerate Array properties, as users are free to " +
"add entries to the Array prototype, for example for polyfills. " +
"You should instead use\n" +
" for (let i in xs) { if (!xs.hasOwnProperty(i)) continue; var x = xs[i]; ... }";
}
});