es-alchemy
Advanced tools
Comparing version 3.4.0 to 3.4.1
@@ -10,5 +10,6 @@ const assert = require('assert'); | ||
if (Array.isArray(filterBy)) { | ||
const key = root === null ? filterBy[0] : `${root}.${filterBy[0]}`; | ||
assert(allowedFields === null || allowedFields.includes(key), 'Unexpected field in filter.'); | ||
return [filterBy[0].substring(0, filterBy[0].lastIndexOf('.')), actionMapFilter[filterBy[1]](key, ...filterBy.slice(2))]; | ||
assert(allowedFields === null || allowedFields.includes(filterBy[0]), `Unexpected field in filter: ${filterBy[0]}`); | ||
const prefix = filterBy[0].substring(0, filterBy[0].lastIndexOf('.')); | ||
assert(root === null || prefix.startsWith(root), 'Can only reference relative paths in sort filters.'); | ||
return [prefix === root ? '' : prefix, actionMapFilter[filterBy[1]](filterBy[0], ...filterBy.slice(2))]; | ||
} // handle "or" and "and" clauses | ||
@@ -41,9 +42,7 @@ | ||
Object.entries(groups).forEach(([prefix, logics]) => { | ||
const pref = root === null ? prefix : `${root}.${prefix}`; | ||
if (clause === 'and' && target === 'separate') { | ||
results.push(actionMapFilter.nest(pref, logics)); | ||
results.push(actionMapFilter.nest(prefix, logics)); | ||
} else { | ||
logics.forEach(logic => { | ||
results.push(actionMapFilter.nest(pref, [logic])); | ||
results.push(actionMapFilter.nest(prefix, [logic])); | ||
}); | ||
@@ -56,2 +55,2 @@ } | ||
module.exports.buildQuery = (filterBy, allowedFields, root = null) => buildRec(filterBy, allowedFields, root)[1]; | ||
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2ZpbHRlci5qcyJdLCJuYW1lcyI6WyJhc3NlcnQiLCJyZXF1aXJlIiwiYWN0aW9uTWFwRmlsdGVyIiwiYWN0aW9uTWFwQm9vbCIsImJ1aWxkUmVjIiwiZmlsdGVyQnkiLCJhbGxvd2VkRmllbGRzIiwicm9vdCIsIkFycmF5IiwiaXNBcnJheSIsImtleSIsImluY2x1ZGVzIiwic3Vic3RyaW5nIiwibGFzdEluZGV4T2YiLCJzbGljZSIsImZpbHRlcktleXMiLCJPYmplY3QiLCJrZXlzIiwiSlNPTiIsInN0cmluZ2lmeSIsInNvcnQiLCJjbGF1c2UiLCJmaWx0ZXIiLCJlIiwiZmlsdGVycyIsInRhcmdldCIsImdyb3VwcyIsImZvckVhY2giLCJwcmVmaXgiLCJsb2dpYyIsInNwbGl0IiwidW5kZWZpbmVkIiwicHVzaCIsInJlc3VsdHMiLCJlbnRyaWVzIiwibG9naWNzIiwicHJlZiIsIm5lc3QiLCJtb2R1bGUiLCJleHBvcnRzIiwiYnVpbGRRdWVyeSJdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTUEsTUFBTSxHQUFHQyxPQUFPLENBQUMsUUFBRCxDQUF0Qjs7QUFDQSxNQUFNQyxlQUFlLEdBQUdELE9BQU8sQ0FBQyxnQ0FBRCxDQUEvQjs7QUFDQSxNQUFNRSxhQUFhLEdBQUdGLE9BQU8sQ0FBQyw4QkFBRCxDQUE3Qjs7QUFFQSxNQUFNRyxRQUFRLEdBQUcsQ0FBQ0MsUUFBRCxFQUFXQyxhQUFYLEVBQTBCQyxJQUExQixLQUFtQztBQUNsRDtBQUNBLE1BQUlDLEtBQUssQ0FBQ0MsT0FBTixDQUFjSixRQUFkLENBQUosRUFBNkI7QUFDM0IsVUFBTUssR0FBRyxHQUFHSCxJQUFJLEtBQUssSUFBVCxHQUFnQkYsUUFBUSxDQUFDLENBQUQsQ0FBeEIsR0FBK0IsR0FBRUUsSUFBSyxJQUFHRixRQUFRLENBQUMsQ0FBRCxDQUFJLEVBQWpFO0FBQ0FMLElBQUFBLE1BQU0sQ0FDSk0sYUFBYSxLQUFLLElBQWxCLElBQTBCQSxhQUFhLENBQUNLLFFB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SyxLQUFYLElBQW9CSSxNQUFNLEtBQUssVUFBbkMsRUFBK0M7QUFDN0NRLE1BQUFBLE9BQU8sQ0FBQ0QsSUFBUixDQUFhOUIsZUFBZSxDQUFDbUMsSUFBaEIsQ0FBcUJELElBQXJCLEVBQTJCRCxNQUEzQixDQUFiO0FBQ0QsS0FGRCxNQUVPO0FBQ0xBLE1BQUFBLE1BQU0sQ0FBQ1IsT0FBUCxDQUFnQkUsS0FBRCxJQUFXO0FBQ3hCSSxRQUFBQSxPQUFPLENBQUNELElBQVIsQ0FBYTlCLGVBQWUsQ0FBQ21DLElBQWhCLENBQXFCRCxJQUFyQixFQUEyQixDQUFDUCxLQUFELENBQTNCLENBQWI7QUFDRCxPQUZEO0FBR0Q7QUFDRixHQVREO0FBVUEsU0FBTyxDQUFDLEVBQUQsRUFBSzFCLGFBQWEsQ0FBQ2tCLE1BQUQsQ0FBYixDQUFzQkEsTUFBTSxLQUFLLEtBQVgsR0FBbUJZLE9BQU8sQ0FBQyxDQUFELENBQTFCLEdBQWdDQSxPQUF0RCxDQUFMLENBQVA7QUFDRCxDQTFERDs7QUE0REFLLE1BQU0sQ0FBQ0MsT0FBUCxDQUFlQyxVQUFmLEdBQTRCLENBQUNuQyxRQUFELEVBQVdDLGFBQVgsRUFBMEJDLElBQUksR0FBRyxJQUFqQyxLQUEwQ0gsUUFBUSxDQUFDQyxRQUFELEVBQVdDLGFBQVgsRUFBMEJDLElBQTFCLENBQVIsQ0FBd0MsQ0FBeEMsQ0FBdEUiLCJzb3VyY2VzQ29udGVudCI6WyJjb25zdCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTtcbmNvbnN0IGFjdGlvbk1hcEZpbHRlciA9IHJlcXVpcmUoJy4uL3Jlc291cmNlcy9hY3Rpb24tbWFwL2ZpbHRlcicpO1xuY29uc3QgYWN0aW9uTWFwQm9vbCA9IHJlcXVpcmUoJy4uL3Jlc291cmNlcy9hY3Rpb24tbWFwL2Jvb2wnKTtcblxuY29uc3QgYnVpbGRSZWMgPSAoZmlsdGVyQnksIGFsbG93ZWRGaWVsZHMsIHJvb3QpID0+IHtcbiAgLy8gaGFuZGxlIGFjdHVhbCBmaWx0ZXIgY2xhdXNlXG4gIGlmIChBcnJheS5pc0FycmF5KGZpbHRlckJ5KSkge1xuICAgIGNvbnN0IGtleSA9IHJvb3QgPT09IG51bGwgPyBmaWx0ZXJCeVswXSA6IGAke3Jvb3R9LiR7ZmlsdGVyQnlbMF19YDtcbiAgICBhc3NlcnQoXG4gICAgICBhbGxvd2VkRmllbGRzID09PSBudWxsIHx8IGFsbG93ZWRGaWVsZHMuaW5jbHVkZXMoa2V5KSxcbiAgICAgICdVbmV4cGVjdGVkIGZpZWxkIGluIGZpbHRlci4nXG4gICAgKTtcbiAgICByZXR1cm4gW1xuICAgICAgZmlsdGVyQnlbMF0uc3Vic3RyaW5nKDAsIGZpbHRlckJ5WzBdLmxhc3RJbmRleE9mKCcuJykpLFxuICAgICAgYWN0aW9uTWFwRmlsdGVyW2ZpbHRlckJ5WzFdXShrZXksIC4uLmZpbHRlckJ5LnNsaWNlKDIpKVxuICAgIF07XG4gIH1cblxuICAvLyBoYW5kbGUgXCJvclwiIGFuZCBcImFuZFwiIGNsYXVzZXNcbiAgYXNzZXJ0KFxuICAgIHR5cGVvZiBmaWx0ZXJCeSA9PT0gJ29iamVjdCcgJiYgIUFycmF5LmlzQXJyYXkoZmlsdGVyQnkpLFxuICAgICdGaWx0ZXIgY2xhdXNlIGV4cGVjdGVkIHRvIGJlIG9mIHR5cGUgb2JqZWN0LidcbiAgKTtcbiAgY29uc3QgZmlsdGVyS2V5cyA9IE9iamVjdC5rZXlzKGZpbHRlckJ5KTtcbiAgYXNzZXJ0KFxuICAgIFsnW1wib3JcIl0nLCAnW1wiYW5kXCJdJywgJ1tcImFuZFwiLFwidGFyZ2V0XCJdJywgJ1tcIm5vdFwiXSddLmluY2x1ZGVzKEpTT04uc3RyaW5naWZ5KGZpbHRlcktleXMuc29ydCgpKSksXG4gICAgJ0ludmFsaWQgZmlsdGVyIGNsYXVzZSBwcm92aWRlZC4nXG4gICk7XG4gIGNvbnN0IGNsYXVzZSA9IGZpbHRlcktleXMuZmlsdGVyKGUgPT4gZSAhPT0gJ3RhcmdldCcpWzBdO1xuICBjb25zdCBmaWx0ZXJzID0gY2xhdXNlID09PSAnbm90JyA/IFtmaWx0ZXJCeVtjbGF1c2VdXSA6IGZpbHRlckJ5W2NsYXVzZV07XG4gIGNvbnN0IHRhcmdldCA9IGZpbHRlckJ5LnRhcmdldCB8fCAnc2VwYXJhdGUnO1xuICBhc3NlcnQoWydzZXBhcmF0ZScsICd1bmlvbiddLmluY2x1ZGVzKHRhcmdldCkpO1xuXG4gIC8vIGhhbmRsZSBjbGF1c2UgY29udGVudCByZWN1cnNpdmVseVxuICBjb25zdCBncm91cHMgPSB7fTtcbiAgZmlsdGVycy5mb3JFYWNoKChmaWx0ZXIpID0+IHtcbiAgICBhc3NlcnQoXG4gICAgICBbJ3N0cmluZycsICdvYmplY3QnXS5pbmNsdWRlcyh0eXBlb2YgZmlsdGVyKSxcbiAgICAgICdGaWx0ZXIgY2xhdXNlIGVudHJpZXMgZXhwZWN0ZWQgdG8gYmUgc3RyaW5nLCBhcnJheSBvciBvYmplY3QuJ1xuICAgICk7XG4gICAgY29uc3QgW3ByZWZpeCwgbG9naWNdID0gYnVpbGRSZWModHlwZW9mIGZpbHRlciA9PT0gJ3N0cmluZycgPyBmaWx0ZXIuc3BsaXQoJyAnKSA6IGZpbHRlciwgYWxsb3dlZEZpZWxkcywgcm9vdCk7XG4gICAgaWYgKGdyb3Vwc1twcmVmaXhdID09PSB1bmRlZmluZWQpIHtcbiAgICAgIGdyb3Vwc1twcmVmaXhdID0gW107XG4gICAgfVxuICAgIGdyb3Vwc1twcmVmaXhdLnB1c2gobG9naWMpO1xuICB9KTtcblxuICAvLyBjcmVhdGUgZmluYWwgY2xhdXNlIGFuZCByZXR1cm5cbiAgY29uc3QgcmVzdWx0cyA9IFtdO1xuICByZXN1bHRzLnB1c2goLi4uKGdyb3Vwc1snJ10gfHwgW10pKTtcbiAgZGVsZXRlIGdyb3Vwc1snJ107XG4gIE9iamVjdC5lbnRyaWVzKGdyb3VwcykuZm9yRWFjaCgoW3ByZWZpeCwgbG9naWNzXSkgPT4ge1xuICAgIGNvbnN0IHByZWYgPSByb290ID09PSBudWxsID8gcHJlZml4IDogYCR7cm9vdH0uJHtwcmVmaXh9YDtcbiAgICBpZiAoY2xhdXNlID09PSAnYW5kJyAmJiB0YXJnZXQgPT09ICdzZXBhcmF0ZScpIHtcbiAgICAgIHJlc3VsdHMucHVzaChhY3Rpb25NYXBGaWx0ZXIubmVzdChwcmVmLCBsb2dpY3MpKTtcbiAgICB9IGVsc2Uge1xuICAgICAgbG9naWNzLmZvckVhY2goKGxvZ2ljKSA9PiB7XG4gICAgICAgIHJlc3VsdHMucHVzaChhY3Rpb25NYXBGaWx0ZXIubmVzdChwcmVmLCBbbG9naWNdKSk7XG4gICAgICB9KTtcbiAgICB9XG4gIH0pO1xuICByZXR1cm4gWycnLCBhY3Rpb25NYXBCb29sW2NsYXVzZV0oY2xhdXNlID09PSAnbm90JyA/IHJlc3VsdHNbMF0gOiByZXN1bHRzKV07XG59O1xuXG5tb2R1bGUuZXhwb3J0cy5idWlsZFF1ZXJ5ID0gKGZpbHRlckJ5LCBhbGxvd2VkRmllbGRzLCByb290ID0gbnVsbCkgPT4gYnVpbGRSZWMoZmlsdGVyQnksIGFsbG93ZWRGaWVsZHMsIHJvb3QpWzFdO1xuIl19 | ||
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2ZpbHRlci5qcyJdLCJuYW1lcyI6WyJhc3NlcnQiLCJyZXF1aXJlIiwiYWN0aW9uTWFwRmlsdGVyIiwiYWN0aW9uTWFwQm9vbCIsImJ1aWxkUmVjIiwiZmlsdGVyQnkiLCJhbGxvd2VkRmllbGRzIiwicm9vdCIsIkFycmF5IiwiaXNBcnJheSIsImluY2x1ZGVzIiwicHJlZml4Iiwic3Vic3RyaW5nIiwibGFzdEluZGV4T2YiLCJzdGFydHNXaXRoIiwic2xpY2UiLCJmaWx0ZXJLZXlzIiwiT2JqZWN0Iiwia2V5cyIsIkpTT04iLCJzdHJpbmdpZnkiLCJzb3J0IiwiY2xhdXNlIiwiZmlsdGVyIiwiZSIsImZpbHRlcnMiLCJ0YXJnZXQiLCJncm91cHMiLCJmb3JFYWNoIiwibG9naWMiLCJzcGxpdCIsInVuZGVmaW5lZCIsInB1c2giLCJyZXN1bHRzIiwiZW50cmllcyIsImxvZ2ljcyIsIm5lc3QiLCJtb2R1bGUiLCJleHBvcnRzIiwiYnVpbGRRdWVyeSJdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTUEsTUFBTSxHQUFHQyxPQUFPLENBQUMsUUFBRCxDQUF0Qjs7QUFDQSxNQUFNQyxlQUFlLEdBQUdELE9BQU8sQ0FBQyxnQ0FBRCxDQUEvQjs7QUFDQSxNQUFNRSxhQUFhLEdBQUdGLE9BQU8sQ0FBQyw4QkFBRCxDQUE3Qjs7QUFFQSxNQUFNRyxRQUFRLEdBQUcsQ0FBQ0MsUUFBRCxFQUFXQyxhQUFYLEVBQTBCQyxJQUExQixLQUFtQztBQUNsRDtBQUNBLE1BQUlDLEtBQUssQ0FBQ0MsT0FBTixDQUFjSixRQUFkLENBQUosRUFBNkI7QUFDM0JMLElBQUFBLE1BQU0sQ0FDSk0sYUFBYSxLQUFLLElBQWxCLElBQTBCQSxhQUFhLENBQUNJLFFBQWQsQ0FBdUJMLFFBQVEsQ0FBQyxDQUFELENBQS9CLENBRHRCLEVBRUgsK0JBQThCQSxRQUFRLENBQUMsQ0FBRCxDQUFJLEVBRnZDLENBQU47QUFJQSxVQUFNTSxNQUFNLEdBQUdOLFFBQVEsQ0FBQyxD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RCxLQUFzQjtBQUNuRCxRQUFJYixNQUFNLEtBQUssS0FBWCxJQUFvQkksTUFBTSxLQUFLLFVBQW5DLEVBQStDO0FBQzdDTyxNQUFBQSxPQUFPLENBQUNELElBQVIsQ0FBYTlCLGVBQWUsQ0FBQ2tDLElBQWhCLENBQXFCekIsTUFBckIsRUFBNkJ3QixNQUE3QixDQUFiO0FBQ0QsS0FGRCxNQUVPO0FBQ0xBLE1BQUFBLE1BQU0sQ0FBQ1AsT0FBUCxDQUFnQkMsS0FBRCxJQUFXO0FBQ3hCSSxRQUFBQSxPQUFPLENBQUNELElBQVIsQ0FBYTlCLGVBQWUsQ0FBQ2tDLElBQWhCLENBQXFCekIsTUFBckIsRUFBNkIsQ0FBQ2tCLEtBQUQsQ0FBN0IsQ0FBYjtBQUNELE9BRkQ7QUFHRDtBQUNGLEdBUkQ7QUFTQSxTQUFPLENBQUMsRUFBRCxFQUFLMUIsYUFBYSxDQUFDbUIsTUFBRCxDQUFiLENBQXNCQSxNQUFNLEtBQUssS0FBWCxHQUFtQlcsT0FBTyxDQUFDLENBQUQsQ0FBMUIsR0FBZ0NBLE9BQXRELENBQUwsQ0FBUDtBQUNELENBdkREOztBQXlEQUksTUFBTSxDQUFDQyxPQUFQLENBQWVDLFVBQWYsR0FBNEIsQ0FBQ2xDLFFBQUQsRUFBV0MsYUFBWCxFQUEwQkMsSUFBSSxHQUFHLElBQWpDLEtBQTBDSCxRQUFRLENBQUNDLFFBQUQsRUFBV0MsYUFBWCxFQUEwQkMsSUFBMUIsQ0FBUixDQUF3QyxDQUF4QyxDQUF0RSIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IGFzc2VydCA9IHJlcXVpcmUoJ2Fzc2VydCcpO1xuY29uc3QgYWN0aW9uTWFwRmlsdGVyID0gcmVxdWlyZSgnLi4vcmVzb3VyY2VzL2FjdGlvbi1tYXAvZmlsdGVyJyk7XG5jb25zdCBhY3Rpb25NYXBCb29sID0gcmVxdWlyZSgnLi4vcmVzb3VyY2VzL2FjdGlvbi1tYXAvYm9vbCcpO1xuXG5jb25zdCBidWlsZFJlYyA9IChmaWx0ZXJCeSwgYWxsb3dlZEZpZWxkcywgcm9vdCkgPT4ge1xuICAvLyBoYW5kbGUgYWN0dWFsIGZpbHRlciBjbGF1c2VcbiAgaWYgKEFycmF5LmlzQXJyYXkoZmlsdGVyQnkpKSB7XG4gICAgYXNzZXJ0KFxuICAgICAgYWxsb3dlZEZpZWxkcyA9PT0gbnVsbCB8fCBhbGxvd2VkRmllbGRzLmluY2x1ZGVzKGZpbHRlckJ5WzBdKSxcbiAgICAgIGBVbmV4cGVjdGVkIGZpZWxkIGluIGZpbHRlcjogJHtmaWx0ZXJCeVswXX1gXG4gICAgKTtcbiAgICBjb25zdCBwcmVmaXggPSBmaWx0ZXJCeVswXS5zdWJzdHJpbmcoMCwgZmlsdGVyQnlbMF0ubGFzdEluZGV4T2YoJy4nKSk7XG4gICAgYXNzZXJ0KHJvb3QgPT09IG51bGwgfHwgcHJlZml4LnN0YXJ0c1dpdGgocm9vdCksICdDYW4gb25seSByZWZlcmVuY2UgcmVsYXRpdmUgcGF0aHMgaW4gc29ydCBmaWx0ZXJzLicpO1xuICAgIHJldHVybiBbcHJlZml4ID09PSByb290ID8gJycgOiBwcmVmaXgsIGFjdGlvbk1hcEZpbHRlcltmaWx0ZXJCeVsxXV0oZmlsdGVyQnlbMF0sIC4uLmZpbHRlckJ5LnNsaWNlKDIpKV07XG4gIH1cblxuICAvLyBoYW5kbGUgXCJvclwiIGFuZCBcImFuZFwiIGNsYXVzZXNcbiAgYXNzZXJ0KFxuICAgIHR5cGVvZiBmaWx0ZXJCeSA9PT0gJ29iamVjdCcgJiYgIUFycmF5LmlzQXJyYXkoZmlsdGVyQnkpLFxuICAgICdGaWx0ZXIgY2xhdXNlIGV4cGVjdGVkIHRvIGJlIG9mIHR5cGUgb2JqZWN0LidcbiAgKTtcbiAgY29uc3QgZmlsdGVyS2V5cyA9IE9iamVjdC5rZXlzKGZpbHRlckJ5KTtcbiAgYXNzZXJ0KFxuICAgIFsnW1wib3JcIl0nLCAnW1wiYW5kXCJdJywgJ1tcImFuZFwiLFwidGFyZ2V0XCJdJywgJ1tcIm5vdFwiXSddLmluY2x1ZGVzKEpTT04uc3RyaW5naWZ5KGZpbHRlcktleXMuc29ydCgpKSksXG4gICAgJ0ludmFsaWQgZmlsdGVyIGNsYXVzZSBwcm92aWRlZC4nXG4gICk7XG4gIGNvbnN0IGNsYXVzZSA9IGZpbHRlcktleXMuZmlsdGVyKGUgPT4gZSAhPT0gJ3RhcmdldCcpWzBdO1xuICBjb25zdCBmaWx0ZXJzID0gY2xhdXNlID09PSAnbm90JyA/IFtmaWx0ZXJCeVtjbGF1c2VdXSA6IGZpbHRlckJ5W2NsYXVzZV07XG4gIGNvbnN0IHRhcmdldCA9IGZpbHRlckJ5LnRhcmdldCB8fCAnc2VwYXJhdGUnO1xuICBhc3NlcnQoWydzZXBhcmF0ZScsICd1bmlvbiddLmluY2x1ZGVzKHRhcmdldCkpO1xuXG4gIC8vIGhhbmRsZSBjbGF1c2UgY29udGVudCByZWN1cnNpdmVseVxuICBjb25zdCBncm91cHMgPSB7fTtcbiAgZmlsdGVycy5mb3JFYWNoKChmaWx0ZXIpID0+IHtcbiAgICBhc3NlcnQoXG4gICAgICBbJ3N0cmluZycsICdvYmplY3QnXS5pbmNsdWRlcyh0eXBlb2YgZmlsdGVyKSxcbiAgICAgICdGaWx0ZXIgY2xhdXNlIGVudHJpZXMgZXhwZWN0ZWQgdG8gYmUgc3RyaW5nLCBhcnJheSBvciBvYmplY3QuJ1xuICAgICk7XG4gICAgY29uc3QgW3ByZWZpeCwgbG9naWNdID0gYnVpbGRSZWModHlwZW9mIGZpbHRlciA9PT0gJ3N0cmluZycgPyBmaWx0ZXIuc3BsaXQoJyAnKSA6IGZpbHRlciwgYWxsb3dlZEZpZWxkcywgcm9vdCk7XG4gICAgaWYgKGdyb3Vwc1twcmVmaXhdID09PSB1bmRlZmluZWQpIHtcbiAgICAgIGdyb3Vwc1twcmVmaXhdID0gW107XG4gICAgfVxuICAgIGdyb3Vwc1twcmVmaXhdLnB1c2gobG9naWMpO1xuICB9KTtcblxuICAvLyBjcmVhdGUgZmluYWwgY2xhdXNlIGFuZCByZXR1cm5cbiAgY29uc3QgcmVzdWx0cyA9IFtdO1xuICByZXN1bHRzLnB1c2goLi4uKGdyb3Vwc1snJ10gfHwgW10pKTtcbiAgZGVsZXRlIGdyb3Vwc1snJ107XG4gIE9iamVjdC5lbnRyaWVzKGdyb3VwcykuZm9yRWFjaCgoW3ByZWZpeCwgbG9naWNzXSkgPT4ge1xuICAgIGlmIChjbGF1c2UgPT09ICdhbmQnICYmIHRhcmdldCA9PT0gJ3NlcGFyYXRlJykge1xuICAgICAgcmVzdWx0cy5wdXNoKGFjdGlvbk1hcEZpbHRlci5uZXN0KHByZWZpeCwgbG9naWNzKSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGxvZ2ljcy5mb3JFYWNoKChsb2dpYykgPT4ge1xuICAgICAgICByZXN1bHRzLnB1c2goYWN0aW9uTWFwRmlsdGVyLm5lc3QocHJlZml4LCBbbG9naWNdKSk7XG4gICAgICB9KTtcbiAgICB9XG4gIH0pO1xuICByZXR1cm4gWycnLCBhY3Rpb25NYXBCb29sW2NsYXVzZV0oY2xhdXNlID09PSAnbm90JyA/IHJlc3VsdHNbMF0gOiByZXN1bHRzKV07XG59O1xuXG5tb2R1bGUuZXhwb3J0cy5idWlsZFF1ZXJ5ID0gKGZpbHRlckJ5LCBhbGxvd2VkRmllbGRzLCByb290ID0gbnVsbCkgPT4gYnVpbGRSZWMoZmlsdGVyQnksIGFsbG93ZWRGaWVsZHMsIHJvb3QpWzFdO1xuIl19 |
{ | ||
"name": "es-alchemy", | ||
"version": "3.4.0", | ||
"version": "3.4.1", | ||
"description": "Simplification of Elasticsearch interactions", | ||
@@ -48,3 +48,3 @@ "main": "lib/index.js", | ||
"js-gardener": "2.0.30", | ||
"nyc": "14.1.0", | ||
"nyc": "14.1.1", | ||
"request": "2.88.0", | ||
@@ -51,0 +51,0 @@ "request-promise-native": "1.0.7", |
160928