allows more flexible timelion queries

src/core_plugins/timelion/public/chain.peg

@@ -21,7 +21,7 @@
 }
 
 start
- = tree:series+ {
+ = tree:series {
   return {
     tree: tree.filter(function (o) {return o != null}),
     functions: functions,
@@ -31,15 +31,12 @@ start
  }
 
 arg_list
- = first:argument rest:more_args* {
+ = first:argument rest:(space? ',' space? arg:argument {return arg})* space? ','? {
   return [first].concat(rest);
  }
 
-more_args
- = ','? space? arg:argument {return arg;}
-
 argument
- = name:function_name '=' value:arg_type {
+ = name:function_name space? '=' space? value:arg_type {
   return {
    type: 'namedArg',
    name: name,
@@ -82,13 +79,15 @@ series_type
  / reference
 
 series
- = series:series_type ','? space? { return series }
+ = first:series_type rest:(space? ',' space? series:series_type {return series})* ','? {
+  return [first].concat(rest)
+ }
 
 function_name
- = (first:[a-zA-Z]+ rest:[.a-zA-Z0-9_-]* ) { return first.join('') + rest.join('') }
+ = first:[a-zA-Z]+ rest:[.a-zA-Z0-9_-]* { return first.join('') + rest.join('') }
 
 function "function"
- = '.' name:function_name '(' space? arg_list:arg_list? space? ')' {
+ = space? '.' name:function_name space? '(' space? arg_list:arg_list? space? ')' {
   var result = {
     type: 'function',
     function: name,
@@ -132,10 +131,10 @@ reference
 
 
 chain
- = func:function rest:function* {return {type: 'chain', chain: [func].concat(rest)}}
+ = func:function space? rest:function* {return {type: 'chain', chain: [func].concat(rest)}}
 
 group
- = '(' space? grouped:series+ space? ')' functions:function* {
+ = '(' space? grouped:series space? ')' functions:function* {
   var first = {
     type: 'chainList',
     list: grouped
@@ -162,7 +161,7 @@ literal "literal"
   }
 
 space
- = [\ \t]+
+ = [\ \t\r\n]+
 
 dq_char
   = "\\" sequence:('"' / "\\") { return sequence; }

src/core_plugins/timelion/server/handlers/__tests__/parse_sheet.js

@@ -0,0 +1,34 @@
+const parseSheet = require('../lib/parse_sheet');
+
+const expect = require('chai').expect;
+
+describe('timelion parse_sheet function', function () {
+  it(`doesn't split expressions on whitespace`, async function () {
+    const data = ['.es() .es(404)'];
+    const ast = parseSheet(data);
+
+    const expressions = ast[0];
+    expect(expressions.length).to.equal(1);
+    expect(expressions[0].type).to.equal('chain');
+  });
+
+  it('splits expressions on commas', function () {
+    const data = ['.es(), .es(404)'];
+    const ast = parseSheet(data);
+
+    const expressions = ast[0];
+    expect(expressions.length).to.equal(2);
+    expect(expressions[0].type).to.equal('chain');
+    expect(expressions[1].type).to.equal('chain');
+  });
+
+  it('splits expressions on newlines', function () {
+    const data = [`.es()\n\r ,\n\r .es(404)`];
+    const ast = parseSheet(data);
+
+    const expressions = ast[0];
+    expect(expressions.length).to.equal(2);
+    expect(expressions[0].type).to.equal('chain');
+    expect(expressions[1].type).to.equal('chain');
+  });
+});

src/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js

@@ -1,9 +1,31 @@
 import moment from 'moment';
+import sinon from 'sinon';
 import timelionDefaults from '../../../lib/get_namespaced_settings';
+import esResponse from './es_response';
 
 module.exports = function () {
+
+  const functions = require('../../../lib/load_functions')('series_functions');
+  const server = {
+    plugins: {
+      timelion: {
+        getFunction: (name) => {
+          if (!functions[name]) throw new Error ('No such function: ' + name);
+          return functions[name];
+        }
+      },
+      elasticsearch: {
+        getCluster: sinon.stub().withArgs('data').returns({
+          callWithRequest: function () {
+            return Promise.resolve(esResponse);
+          }
+        })
+      }
+    }
+  };
+
   const tlConfig = require('../../../handlers/lib/tl_config.js')({
-    server: {},
+    server: server,
     request: {}
   });