tg-client-query-builder
Advanced tools
Comparing version 2.12.0 to 2.12.1
@@ -58,8 +58,5 @@ "use strict"; | ||
function numberOfArgs(opName, argLength) { | ||
var _arguments2 = arguments; | ||
return function () { | ||
var args = [].slice.call(_arguments2); | ||
if (args.length !== argLength) { | ||
throw new Error("QueryBuilderError: Args for " + opName + " are of length " + args.length + ", but they should be of length " + argLength); | ||
if (arguments.length !== argLength) { | ||
throw new Error("QueryBuilderError: Args for " + opName + " are of length " + arguments.length + ", but they should be of length " + argLength); | ||
} | ||
@@ -146,7 +143,6 @@ }; | ||
} | ||
} | ||
// 'subString', //tnr: not yet implemented | ||
// 'dateOnly', //tnr: not yet implemented | ||
]; | ||
// 'subString', //tnr: not yet implemented | ||
// 'dateOnly', //tnr: not yet implemented | ||
}]; | ||
@@ -380,9 +376,12 @@ module.exports = function () { | ||
var filter = function filter() { | ||
var args = [].slice.call(arguments); | ||
for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { | ||
args[_key] = arguments[_key]; | ||
} | ||
var argsToUse = args; | ||
var opNameToUse = opName; | ||
if (transform) { | ||
var _transform$call = transform.call(args), | ||
newOpName = _transform$call.newOpName, | ||
newArgs = _transform$call.newArgs; | ||
var _transform = transform.apply(undefined, args), | ||
newOpName = _transform.newOpName, | ||
newArgs = _transform.newArgs; | ||
@@ -393,3 +392,3 @@ argsToUse = newArgs; | ||
sanityChecks.forEach(function (sanityCheck) { | ||
sanityCheck.call(argsToUse); | ||
sanityCheck.apply(undefined, args); | ||
}); | ||
@@ -396,0 +395,0 @@ return new FilterExpression(opNameToUse, argsToUse); |
{ | ||
"name": "tg-client-query-builder", | ||
"version": "2.12.0", | ||
"version": "2.12.1", | ||
"description": "Teselagen Client Side (browser) SQL Query Builder", | ||
@@ -12,2 +12,3 @@ "main": "build/query-builder/index.js", | ||
}, | ||
"prepublish": "yarn build", | ||
"dependencies": { | ||
@@ -14,0 +15,0 @@ "lodash": "^4.17.4" |
@@ -61,4 +61,3 @@ // valid filters: | ||
function numberOfArgs(opName, argLength) { | ||
return () => { | ||
var args = [].slice.call(arguments); | ||
return (...args) => { | ||
if (args.length !== argLength) { | ||
@@ -458,12 +457,11 @@ throw new Error( | ||
expressionOperators.forEach(({ opName, sanityChecks, transform }) => { | ||
const filter = function () { | ||
var args = [].slice.call(arguments); | ||
const filter = (...args)=> { | ||
let argsToUse = args | ||
let opNameToUse = opName | ||
if (transform) { | ||
let { newOpName, newArgs } = transform.call(args) | ||
let { newOpName, newArgs } = transform(...args) | ||
argsToUse = newArgs | ||
opNameToUse = newOpName | ||
} | ||
sanityChecks.forEach((sanityCheck) => { sanityCheck.call(argsToUse) }) | ||
sanityChecks.forEach((sanityCheck) => { sanityCheck(...args) }) | ||
return new FilterExpression(opNameToUse, argsToUse); | ||
@@ -470,0 +468,0 @@ }; |
98552
1195