Skip to content

Implement 'endswith' and 'startswith' OData functions. #36

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
ccoddington wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implement 'endswith' and 'startswith' OData functions. #36

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdb4e4a
Implement 'endswith' and 'startswith' OData functions.
ccoddington Aug 30, 2018
ae76eac
re: #55 Added ODATA filter operator "ne"
ccoddington Oct 23, 2018
bf667b6
re: #71 Fix OData "and" and "or" comparison operations when the type …
ccoddington Nov 29, 2018
3fe088e
re: #56 Make OData functions case insensitive.
ccoddington Nov 29, 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
56 changes: 50 additions & 6 deletions lib/queryTransform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ Node.prototype.transform = function () {
result[this.left.name] = this.right.value
}

if (this.type === 'ne' && this.right.type === 'literal') {
result[this.left.name] = { '$ne': this.right.value }
}

if (this.type === 'lt' && this.right.type === 'literal') {
result[this.left.name] = { '$lt': this.right.value }
}
Expand All @@ -61,28 +65,68 @@ Node.prototype.transform = function () {

if (this.type === 'and') {
result['$and'] = result['$and'] || []
result['$and'].push(new Node(this.left.type, this.left.left, this.left.right, this.func, this.args).transform())
result['$and'].push(new Node(this.right.type, this.right.left, this.right.right, this.func, this.args).transform())
if (this.left.type !== 'functioncall') {
result['$and'].push(new Node(this.left.type, this.left.left, this.left.right, this.func, this.args).transform())
} else {
result['$and'].push(new Node(this.left.type, this.left.left, this.left.right, this.left.func, this.left.args).transform())
}

if (this.right.type !== 'functioncall') {
result['$and'].push(new Node(this.right.type, this.right.left, this.right.right, this.func, this.args).transform())
} else {
result['$and'].push(new Node(this.right.type, this.right.left, this.right.right, this.right.func, this.right.args).transform())
}
}

if (this.type === 'or') {
result['$or'] = result['$or'] || []
result['$or'].push(new Node(this.left.type, this.left.left, this.left.right, this.func, this.args).transform())
result['$or'].push(new Node(this.right.type, this.right.left, this.right.right, this.func, this.args).transform())
if (this.left.type !== 'functioncall') {
result['$or'].push(new Node(this.left.type, this.left.left, this.left.right, this.func, this.args).transform())
} else {
result['$or'].push(new Node(this.left.type, this.left.left, this.left.right, this.left.func, this.left.args).transform())
}

if (this.right.type !== 'functioncall') {
result['$or'].push(new Node(this.right.type, this.right.left, this.right.right, this.func, this.args).transform())
} else {
result['$or'].push(new Node(this.right.type, this.right.left, this.right.right, this.right.func, this.right.args).transform())
}
}

if (this.type === 'functioncall') {
switch (this.func) {
case 'substringof': substringof(this, result)
case 'endswith':
endswith(this, result)
break
case 'substringof':
substringof(this, result)
break
case 'startswith':
startswith(this, result)
break
}
}

return result
}

function endswith (node, result) {
var prop = node.args[0].type === 'property' ? node.args[0] : node.args[1]
var lit = node.args[0].type === 'literal' ? node.args[0] : node.args[1]

result[prop.name] = {'$regex': new RegExp(lit.value + '$'), '$options': 'i'}
}

function substringof (node, result) {
var prop = node.args[0].type === 'property' ? node.args[0] : node.args[1]
var lit = node.args[0].type === 'literal' ? node.args[0] : node.args[1]

result[prop.name] = new RegExp(lit.value)
result[prop.name] = {'$regex': new RegExp(lit.value), '$options': 'i'}
}

function startswith (node, result) {
var prop = node.args[0].type === 'property' ? node.args[0] : node.args[1]
var lit = node.args[0].type === 'literal' ? node.args[0] : node.args[1]

result[prop.name] = {'$regex': new RegExp('^' + lit.value), '$options': 'i'}
}