Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issues where scopedData is null #72

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+17 −2
Open

Fixed issues where scopedData is null #72

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5742a7
Fixed issues where scopedData is null
ivan133 Sep 26, 2019
772d472
return undefined for if
ivan133 Nov 3, 2019
4b96de9
Added comment operator
ivan133 Dec 19, 2019
b6723e3
Update logic.js
ivan133 Jul 14, 2021
d26fb78
Update logic.js
ivan133 Jul 14, 2021
9062d43
Update logic.js
ivan133 Jul 15, 2021
9e36331
Fixed mapWithScope operation
ivan133 Oct 8, 2021
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
19 changes: 17 additions & 2 deletions logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ http://ricostacruz.com/cheatsheets/umdjs.html
"log": function(a) {
console.log(a); return a;
},
"comment": function(a) {
return a;
},
"in": function(a, b) {
if(!b || typeof b.indexOf === "undefined") return false;
return (b.indexOf(a) !== -1);
Expand Down Expand Up @@ -252,7 +255,7 @@ http://ricostacruz.com/cheatsheets/umdjs.html
}
}
if(values.length === i+1) return jsonLogic.apply(values[i], data);
return null;
return undefined;
}else if(op === "and") { // Return first falsy, or last
for(i=0; i < values.length; i+=1) {
current = jsonLogic.apply(values[i], data);
Expand Down Expand Up @@ -298,6 +301,18 @@ http://ricostacruz.com/cheatsheets/umdjs.html
return jsonLogic.apply(scopedLogic, datum);
});

}else if(op === 'mapWithScope'){
scopedData = jsonLogic.apply(values[0], data);
scopedLogic = values[1];

if ( ! Array.isArray(scopedData)) {
return [];
}

return scopedData.map(function(datum, index){
return jsonLogic.apply(scopedLogic, Object.assign({}, { 'LOOP_VAR': datum }, { 'ROOT_DATA': data, 'CURRENT_LOOP_INDEX': index }));
});

}else if(op === 'reduce'){
scopedData = jsonLogic.apply(values[0], data);
scopedLogic = values[1];
Expand All @@ -318,7 +333,7 @@ http://ricostacruz.com/cheatsheets/umdjs.html
);

}else if(op === "all") {
scopedData = jsonLogic.apply(values[0], data);
scopedData = jsonLogic.apply(values[0], data) || [];
scopedLogic = values[1];
// All of an empty set is false. Note, some and none have correct fallback after the for loop
if( ! scopedData.length) {
Expand Down