Skip to content

Fix empty/null/undefined values for nested objects in filter/args #9

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

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

Fix empty/null/undefined values for nested objects in filter/args #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbec29e
Update js files with prettier
Jan 30, 2018
9d95a8a
Fix filter/args parsing for nested objects
Jan 30, 2018
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
219 changes: 116 additions & 103 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,143 +5,156 @@
//=====================================================

function parceFind(_levelA) {

//+++++++++++++++++++++++++++++++++++ work over Array
//++++++++++++++++++++++++++++++++++++++++++++++++++++

let propsA = _levelA.map(function(currentValue, index) {

let itemX = _levelA[index];

if( itemX instanceof Query){
return itemX.toString();
} else if ( ! Array.isArray(itemX) && "object" === typeof itemX ) {
let propsA = Object.keys(itemX);
if ( 1 !== propsA.length) {
throw new RangeError("Alias objects should only have one value. was passed: "+JSON.stringify(itemX));
}
let propS = propsA[0];
let item = itemX[propS];
// contributor: https://github.com/charlierudolph/graphql-query-builder/commit/878328e857e92d140f5ba6f7cfe07837620ec490
if (Array.isArray(item)) {
return new Query(propS).find(item)
}
return `${propS} : ${item} `;
} else if ( "string" === typeof itemX ) {
return itemX;
} else {
throw new RangeError("cannot handle Find value of "+itemX);
}
});

return propsA.join(",");
//+++++++++++++++++++++++++++++++++++ work over Array
//++++++++++++++++++++++++++++++++++++++++++++++++++++

let propsA = _levelA.map(function(currentValue, index) {
let itemX = _levelA[index];

if (itemX instanceof Query) {
return itemX.toString();
} else if (!Array.isArray(itemX) && "object" === typeof itemX) {
let propsA = Object.keys(itemX);
if (1 !== propsA.length) {
throw new RangeError(
"Alias objects should only have one value. was passed: " +
JSON.stringify(itemX)
);
}
let propS = propsA[0];
let item = itemX[propS];
// contributor: https://github.com/charlierudolph/graphql-query-builder/commit/878328e857e92d140f5ba6f7cfe07837620ec490
if (Array.isArray(item)) {
return new Query(propS).find(item);
}
return `${propS} : ${item} `;
} else if ("string" === typeof itemX) {
return itemX;
} else {
throw new RangeError("cannot handle Find value of " + itemX);
}
});

return propsA.join(",");
}

//=====================================================
//=================================== get GraphQL Value
//=====================================================

function getGraphQLValue(value) {
if ("string" === typeof value) {
value = JSON.stringify(value);
} else if (Array.isArray(value)) {
value = value.map(item => {
return getGraphQLValue(item);
}).join();
value = `[${value}]`;
} else if ("object" === typeof value) {
/*if (value.toSource)
if (value === null) {
return value;
} else if ("string" === typeof value) {
value = JSON.stringify(value);
} else if (Array.isArray(value)) {
value = value
.map(item => {
return getGraphQLValue(item);
})
.join();
value = `[${value}]`;
} else if ("object" === typeof value) {
/*if (value.toSource)
value = value.toSource().slice(2,-2);
else*/
value = objectToString(value);
//console.error("No toSource!!",value);
}
return value;
value = objectToString(value);
if (value === "{}") return undefined;
//console.error("No toSource!!",value);
}
return value;
}

function objectToString(obj) {

let sourceA = [];
for(let prop in obj){

for (let prop in obj) {
if ("function" === typeof obj[prop]) {
continue;
}
// if ("object" === typeof obj[prop]) {
sourceA.push(`${prop}:${getGraphQLValue(obj[prop])}`);
// } else {
// sourceA.push(`${prop}:${obj[prop]}`);
// }
// if ("object" === typeof obj[prop]) {
let value = getGraphQLValue(obj[prop]);
if (typeof value !== "undefined") {
sourceA.push(`${prop}:${value}`);
}
// } else {
// sourceA.push(`${prop}:${obj[prop]}`);
// }
}
return `{${sourceA.join()}}`;
}




//=====================================================
//========================================= Query Class
//=====================================================

function Query(_fnNameS, _aliasS_OR_Filter){

this.fnNameS = _fnNameS;
this.headA = [];

this.filter = (filtersO) => {

for(let propS in filtersO){
if ("function" === typeof filtersO[propS]) {
continue;
}
let val = getGraphQLValue(filtersO[propS]);
if ("{}" === val) {
continue;
}
this.headA.push( `${propS}:${val}` );
}
return this;
};

if ("string" === typeof _aliasS_OR_Filter) {
this.aliasS = _aliasS_OR_Filter;
} else if ("object" === typeof _aliasS_OR_Filter) {
this.filter(_aliasS_OR_Filter);
} else if (undefined === _aliasS_OR_Filter && 2 === arguments.length){
throw new TypeError("You have passed undefined as Second argument to 'Query'");
} else if (undefined !== _aliasS_OR_Filter){
throw new TypeError("Second argument to 'Query' should be an alias name(String) or filter arguments(Object). was passed "+_aliasS_OR_Filter);
function Query(_fnNameS, _aliasS_OR_Filter) {
this.fnNameS = _fnNameS;
this.headA = [];

this.filter = filtersO => {
for (let propS in filtersO) {
if ("function" === typeof filtersO[propS]) {
continue;
}
let val = getGraphQLValue(filtersO[propS]);
if (typeof val !== "undefined") {
this.headA.push(`${propS}:${val}`);
}
}
return this;
};

this.setAlias = (_aliasS) =>{
this.aliasS = _aliasS;
return this;
};

this.find = function(findA) { // THIS NEED TO BE A "FUNCTION" to scope 'arguments'
if( ! findA){
throw new TypeError("find value can not be >>falsy<<");
}
// if its a string.. it may have other values
// else it sould be an Object or Array of maped values
this.bodyS = parceFind((Array.isArray(findA)) ? findA : Array.from(arguments));
return this;
};
if ("string" === typeof _aliasS_OR_Filter) {
this.aliasS = _aliasS_OR_Filter;
} else if ("object" === typeof _aliasS_OR_Filter) {
this.filter(_aliasS_OR_Filter);
} else if (undefined === _aliasS_OR_Filter && 2 === arguments.length) {
throw new TypeError(
"You have passed undefined as Second argument to 'Query'"
);
} else if (undefined !== _aliasS_OR_Filter) {
throw new TypeError(
"Second argument to 'Query' should be an alias name(String) or filter arguments(Object). was passed " +
_aliasS_OR_Filter
);
}

this.setAlias = _aliasS => {
this.aliasS = _aliasS;
return this;
};

this.find = function(findA) {
// THIS NEED TO BE A "FUNCTION" to scope 'arguments'
if (!findA) {
throw new TypeError("find value can not be >>falsy<<");
}
// if its a string.. it may have other values
// else it sould be an Object or Array of maped values
this.bodyS = parceFind(
Array.isArray(findA) ? findA : Array.from(arguments)
);
return this;
};
}

//=====================================================
//===================================== Query prototype
//=====================================================

Query.prototype = {

toString : function(){
if (undefined === this.bodyS) {
throw new ReferenceError("return properties are not defined. use the 'find' function to defined them");
}

return `${ (this.aliasS) ? (this.aliasS + ":") : "" } ${this.fnNameS } ${ (0 < this.headA.length)?"("+this.headA.join(",")+")":"" } { ${ this.bodyS } }`;
toString: function() {
if (undefined === this.bodyS) {
throw new ReferenceError(
"return properties are not defined. use the 'find' function to defined them"
);
}

return `${this.aliasS ? this.aliasS + ":" : ""} ${this.fnNameS} ${
0 < this.headA.length ? "(" + this.headA.join(",") + ")" : ""
} { ${this.bodyS} }`;
}
};

module.exports = Query;
Loading