Skip to content

feat(loki): add 'dataOptions' to eqJoin #33

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

Merged
merged 1 commit into from
Oct 5, 2017
Merged

feat(loki): add 'dataOptions' to eqJoin #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions packages/loki/src/resultset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ export class Resultset {
rs = rs.map(step.value);
break;
case "eqJoin":
rs = rs.eqJoin(step.joinData, step.leftJoinKey, step.rightJoinKey, step.mapFun);
rs = rs.eqJoin(step.joinData, step.leftJoinKey, step.rightJoinKey, step.mapFun, step.dataOptions);
break;
// following cases break chain by returning array data so make any of these last in transform steps
case "mapReduce":
Expand Down Expand Up @@ -1125,13 +1125,14 @@ export class Resultset {
/**
* eqJoin() - Left joining two sets of data. Join keys can be defined or calculated properties
* eqJoin expects the right join key values to be unique. Otherwise left data will be joined on the last joinData object with that key
* @param {Array} joinData - Data array to join to.
* @param {Array|Resultset|Collection} joinData - Data array to join to.
* @param {(string|function)} leftJoinKey - Property name in this result set to join on or a function to produce a value to join on
* @param {(string|function)} rightJoinKey - Property name in the joinData to join on or a function to produce a value to join on
* @param {function} [mapFun=] - a function that receives each matching pair and maps them into output objects - function(left,right){return joinedObject}
* @param {object} dataOptions - optional options to apply to data() calls for left and right sides
* @returns {Resultset} A resultset with data in the format [{left: leftObj, right: rightObj}]
*/
eqJoin(joinData, leftJoinKey, rightJoinKey, mapFun) {
eqJoin(joinData, leftJoinKey, rightJoinKey, mapFun, dataOptions) {
let leftData = [];
let leftDataLength;
let rightData = [];
Expand All @@ -1143,12 +1144,14 @@ export class Resultset {
let joinMap = {};

//get the left data
leftData = this.data();
leftData = this.data(dataOptions);
leftDataLength = leftData.length;

//get the right data
if (joinData instanceof Resultset) {
rightData = joinData.data();
if (joinData instanceof Collection) {
rightData = joinData.chain().data(dataOptions);
} else if (joinData instanceof Resultset) {
rightData = joinData.data(dataOptions);
} else if (Array.isArray(joinData)) {
rightData = joinData;
} else {
Expand Down