Merge pull request #8 from caido/ef-source

Source namespace

js/httpql.grammar

@@ -23,6 +23,7 @@
   RequestNamespace { "req" }
   ResponseNamespace { "resp" }
   PresetNamespace { "preset" }
+  SourceNamespace { "source" }
 
   // Row field names
   RowIntFieldName { "id" }
@@ -74,13 +75,14 @@ GroupQuery { LeftParen Query? RightParen }
 
 CombinedQuery { Query !and And Query | Query !or Or Query }
 
-SingleQuery { RowQuery | RequestQuery | ResponseQuery | PresetQuery }
+SingleQuery { RowQuery | RequestQuery | ResponseQuery | PresetQuery | SourceQuery }
 
 IntExpression { IntOperator Colon IntValue }
 StringExpression { StringOperator Colon StringValue | RegexOperator Colon (RegexValue | StringValue) }
 DateExpression { DateOperator Colon StringValue }
 PresetNameExpression { StringValue }
 PresetAliasExpression { SymbolValue }
+SourceNameExpression { StringValue }
 
 RowQuery { RowNamespace Dot RowIntFieldName Dot IntExpression }
 
@@ -99,4 +101,8 @@ PresetQuery {
   PresetNamespace Colon (PresetNameExpression | PresetAliasExpression)
 }
 
+SourceQuery {
+  SourceNamespace Colon SourceNameExpression
+}
+
 @external propSource highlight from "./props.js"

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caido/httpql",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Parser for the HTTPQL language",
   "author": "Caido Labs Inc. <[email protected]>",
   "license": "MIT",

js/src/deserialize/query.single.ts

@@ -10,6 +10,7 @@ import { deserializePresetQuery } from "./query.preset.js";
 import { deserializeRequestQuery } from "./query.request.js";
 import { deserializeResponseQuery } from "./query.response.js";
 import { deserializeRowQuery } from "./query.row.js";
+import { deserializeSourceQuery } from "./query.source.js";
 
 export const deserializeSingleQuery = (
   node: SyntaxNode,
@@ -51,5 +52,14 @@ export const deserializeSingleQuery = (
     });
   }
 
+  const sourceQuery = node.getChild(terms.SourceQuery);
+  if (isPresent(sourceQuery)) {
+    return deserializeSourceQuery(sourceQuery, doc).map((source) => {
+      return {
+        source,
+      };
+    });
+  }
+
   return err(new InvalidQuery());
 };

js/src/deserialize/query.source.ts

@@ -0,0 +1,25 @@
+import type { SyntaxNode } from "@lezer/common";
+import { err, type Result } from "neverthrow";
+
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { ExprSource } from "../primitives.js";
+import { isPresent } from "../utils.js";
+
+import { deserializeString } from "./string.js";
+
+export const deserializeSourceQuery = (
+  node: SyntaxNode,
+  doc: string,
+): Result<ExprSource, HTTPQLError> => {
+  const nameNode = node.getChild(terms.SourceNameExpression);
+  if (isPresent(nameNode)) {
+    return deserializeString(nameNode, doc).map(({ value }) => {
+      return {
+        name: value,
+      };
+    });
+  }
+
+  return err(new InvalidQuery());
+};

js/src/index.spec.ts

@@ -16,7 +16,7 @@ type Test =
 
 describe("httpql", () => {
   describe("ast", () => {
-    const cases = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+    const cases = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
     for (const c of cases) {
       it(`Case ${c}`, () => {
         const input = fs.readFileSync(

js/src/parser/parser.terms.ts

@@ -38,6 +38,9 @@ export const HTTPQL = 1,
   PresetNameExpression = 37,
   PresetAliasExpression = 38,
   SymbolValue = 39,
-  CombinedQuery = 40,
-  And = 41,
-  Or = 42;
+  SourceQuery = 40,
+  SourceNamespace = 41,
+  SourceNameExpression = 42,
+  CombinedQuery = 43,
+  And = 44,
+  Or = 45;

js/src/parser/parser.ts

@@ -5,13 +5,13 @@ import { highlight } from "./props.js";
 export const parser = LRParser.deserialize({
   version: 14,
   states:
-    ")SQVQPOOOkOQO'#C`OOQO'#C_'#C_OsQPO'#CdOzQPO'#CfO!PQPO'#CnO!UQPO'#C{O!ZQPO'#DPOOQO'#Ce'#CeQ!`QPOOOOQO'#C^'#C^OOOO'#DX'#DXO!hOQO,58zOOQO,58z,58zOOQO,59O,59OO!pQPO,59OO!{QPO,59QO#QQPO,59YO#]QSO,59gO#eQWO,59kOVQPO,59pOVQPO,59pOOOO-E7V-E7VOOQO1G.f1G.fOOQO1G.j1G.jO#mQPO1G.lO#rQPO1G.tO#wQPO1G.tO#|QPO1G.tO$RQPO1G/RO$WQPO1G/ROOQO'#DR'#DROOQO'#DS'#DSOOQO1G/V1G/VOOQO1G/[1G/[O$]QPO1G/[O$kQPO7+$WO$kQPO7+$`O$pQSO7+$`O$xQSO7+$`O$kQPO7+$mO$pQSO7+$mO$}QPO'#CjOOQO<<Gr<<GrOOQO<<Gz<<GzO%SQPO'#CrO%XQPO'#CrO%^QPO'#CyOOQO<<HX<<HXO%cQPO,59UOfQPO,59^O%hQPO,59^OfQPO,59eOOQO1G.p1G.pOOQO1G.x1G.xO%pO`O'#CuOOQO1G/P1G/POOOO'#DY'#DYO%{O`O'#CvO&WO`O,59aOOOO-E7W-E7WOOQO1G.{1G.{",
+    ")lQVQPOOOnOQO'#C`OOQO'#C_'#C_OvQPO'#CdO}QPO'#CfO!SQPO'#CnO!XQPO'#C{O!^QPO'#DPO!cQPO'#DUOOQO'#Ce'#CeQ!hQPOOOOQO'#C^'#C^OOOO'#D['#D[O!pOQO,58zOOQO,58z,58zOOQO,59O,59OO!xQPO,59OO#TQPO,59QO#YQPO,59YO#eQSO,59gO#mQWO,59kOiQPO,59pOVQPO,59sOVQPO,59sOOOO-E7Y-E7YOOQO1G.f1G.fOOQO1G.j1G.jO#uQPO1G.lO#zQPO1G.tO$PQPO1G.tO$UQPO1G.tO$ZQPO1G/RO$`QPO1G/ROOQO'#DR'#DROOQO'#DS'#DSOOQO1G/V1G/VOOQO'#DW'#DWOOQO1G/[1G/[OOQO1G/_1G/_O$eQPO1G/_O$sQPO7+$WO$sQPO7+$`O$xQSO7+$`O%QQSO7+$`O$sQPO7+$mO$xQSO7+$mO%VQPO'#CjOOQO<<Gr<<GrOOQO<<Gz<<GzO%[QPO'#CrO%aQPO'#CrO%fQPO'#CyOOQO<<HX<<HXO%kQPO,59UOiQPO,59^O%pQPO,59^OiQPO,59eOOQO1G.p1G.pOOQO1G.x1G.xO%xO`O'#CuOOQO1G/P1G/POOOO'#D]'#D]O&TO`O'#CvO&`O`O,59aOOOO-E7Z-E7ZOOQO1G.{1G.{",
   stateData:
-    "&]~O!POS~OVROZSOcTOpUOtVO!QPO~OTZO!Q]O~OU^O~PVO[`O~O[aO~O[bO~O`cO~OydOzeO~OTZO!QgO~OUhOydOzeO~O]iO~OdjOekOllO~OqmOrnO~OwpO!QPO~O[tO~O[uO~O[vO~O[wO~O[xO~O[yO~OydOzxi}xiUxi~O_zO~Og}Oh!OO~On!PO~O`!RO~O`!SO~O`!TO~O`!UO~Oa!VO~O!QPO!R!XO~O!S!ZO!T!ZOkjP~O!S!ZO!T!ZOkjX~Ok!_O~O",
-  goto: "#q}PP!O![!bPPP![![!rPPP!xPPP!rPPP#RPP#X#[PP#_P!rPPP!rP#b#bP![PP#e#kQXOQ_RQrdRseXYORdeWQORdeQocS!W!S!TR!Y!UXWORdeQ{tQ|uR!QxQ|vR!QyR!W!TR!]!XR|wRqcQ[PRf[Q![!XR!^![",
+    "&e~O!SOS~OVROZSOcTOpUOtVOyWO!TPO~OT[O!T^O~OU_O~PVO[aO~O[bO~O[cO~O`dO~O`eO~O|fO}gO~OT[O!TiO~OUjO|fO}gO~O]kO~OdlOemOlnO~OqoOrpO~OwrO!TPO~O[xO~O[yO~O[zO~O[{O~O[|O~O[}O~O|fO}{i!Q{iU{i~O_!OO~Og!ROh!SO~On!TO~O`!VO~O`!WO~O`!XO~O`!YO~Oa!ZO~O!TPO!U!]O~O!V!_O!W!_OkjP~O!V!_O!W!_OkjX~Ok!cO~O",
+  goto: "#z!QPP!R!_!ePPP!_!_!xPPP#OPPP!xPPP#XPP#_#bPP#eP!xPPP!xP#h#hP!xP#k!_PP#n#tQYOQ`RQvfRwgXZORfgWQORfgQqdQteS![!W!XR!^!YXXORfgQ!PxQ!QyR!U|Q!QzR!U}R![!XR!a!]R!Q{RsdRueQ]PRh]Q!`!]R!b!`",
   nodeNames:
-    "⚠ HTTPQL Query StringQuery StringValue StringChar RightParen LeftParen GroupQuery SingleQuery RowQuery RowNamespace Dot RowIntFieldName IntExpression IntOperator Colon IntValue RequestQuery RequestNamespace RequestIntFieldName RequestStringFieldName StringExpression StringOperator RegexOperator RegexValue RegexContent / RequestDateFieldName DateExpression DateOperator ResponseQuery ResponseNamespace ResponseIntFieldName ResponseStringFieldName PresetQuery PresetNamespace PresetNameExpression PresetAliasExpression SymbolValue CombinedQuery And Or",
-  maxTerm: 51,
+    "⚠ HTTPQL Query StringQuery StringValue StringChar RightParen LeftParen GroupQuery SingleQuery RowQuery RowNamespace Dot RowIntFieldName IntExpression IntOperator Colon IntValue RequestQuery RequestNamespace RequestIntFieldName RequestStringFieldName StringExpression StringOperator RegexOperator RegexValue RegexContent / RequestDateFieldName DateExpression DateOperator ResponseQuery ResponseNamespace ResponseIntFieldName ResponseStringFieldName PresetQuery PresetNamespace PresetNameExpression PresetAliasExpression SymbolValue SourceQuery SourceNamespace SourceNameExpression CombinedQuery And Or",
+  maxTerm: 54,
   nodeProps: [
     ["openedBy", 6, "LeftParen"],
     ["closedBy", 7, "RightParen"],
@@ -20,16 +20,16 @@ export const parser = LRParser.deserialize({
   skippedNodes: [0],
   repeatNodeCount: 2,
   tokenData:
-    "!$T~R!]X^$zpq%Pqr%Wrs%]sx%Wxy%byz%iz}%W}!O%p!O!P&f!P!Q&m!Q![&t![!]'n!]!c%W!c!d'u!d!q%W!q!r(Y!r#O%W#O#P(g#P#R%W#R#S%p#S#T%W#T#U*X#U#V%p#V#W+n#W#X%p#X#Y2{#Y#Z%p#Z#[4}#[#]6h#]#^7j#^#`%p#`#a8h#a#b:X#b#c<r#c#dAk#d#eBi#e#fHT#f#gJV#g#o%p#o#y%W#y#z%P#z$f%W$f$g%P$g#BY%W#BY#BZ%P#BZ$IS%W$IS$I_%P$I_$I|%W$I|$JO%P$JO$JT%W$JT$JU%P$JU$KV%W$KV$KW%P$KW&FU%W&FU&FV%P&FV;'S%W;'S;=`!#}<%lO%Wj%PO!Pjn%WOTS!PjS%]OTS~%bO!Q~U%iOVQTSU%pOUQTSd%wSTSw`}!O&T!Q![&T#R#S&T#T#o&T`&YSw`}!O&T!Q![&T#R#S&T#T#o&TU&mO[QTSU&tO!RQTSf&}SaQTSw`}!O&T!Q!['Z#R#S&T#T#o&Tb'bSaQw`}!O&T!Q!['Z#R#S&T#T#o&TU'uO`QTSU'zPTS!p!q'}Q(QP!f!g(TQ(YOyQU(_PTS!t!u(bQ(gOzQS(jXrs%W!P!Q%W#O#P%W#U#V%W#Y#Z%W#b#c%W#f#g%W#h#i%W#i#j)VS)YR!Q![)c!c!i)c#T#Z)cS)fR!Q![)o!c!i)o#T#Z)oS)rR!Q![){!c!i){#T#Z){S*OR!Q![%W!c!i%W#T#Z%Wf*`UTSw`}!O&T!Q![&T#R#S&T#T#b&T#b#c*r#c#o&Tb*wUw`}!O&T!Q![&T#R#S&T#T#W&T#W#X+Z#X#o&Tb+bSyQw`}!O&T!Q![&T#R#S&T#T#o&Tn+uWTSw`}!O&T!Q![&T#R#S&T#T#c&T#c#d,_#d#f&T#f#g.t#g#o&Th,dWw`}!O&T!Q![&T#R#S&T#T#W&T#W#X,|#X#b&T#b#c-x#c#o&Th-RUw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y-e#Y#o&Th-lSqWw`}!O&T!Q![&T#R#S&T#T#o&Th-}Uw`}!O&T!Q![&T#R#S&T#T#h&T#h#i.a#i#o&Th.hSgWw`}!O&T!Q![&T#R#S&T#T#o&Tb.yUw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y/]#Y#o&Tb/bTw`}!O&T!Q![&T#R#S&T#T#U/q#U#o&Tb/vUw`}!O&T!Q![&T#R#S&T#T#h&T#h#i0Y#i#o&Tb0_Uw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y0q#Y#o&Tb0vUw`}!O&T!Q![&T#R#S&T#T#W&T#W#X1Y#X#o&Tb1_Sw`}!O&T!Q![&T#R#S1k#T#o&Tb1pTw`}!O&T!Q![&T#R#S&T#T#U2P#U#o&Tb2UUw`}!O&T!Q![&T#R#S&T#T#h&T#h#i2h#i#o&Tb2oSlQw`}!O&T!Q![&T#R#S&T#T#o&Tn3SWTSw`}!O&T!Q![&T#R#S&T#T#e&T#e#f3l#f#l&T#l#m4R#m#o&Tj3uS_QgWw`}!O&T!Q![&T#R#S&T#T#o&Tb4WUw`}!O&T!Q![&T#R#S&T#T#h&T#h#i4j#i#o&Tb4qSeQw`}!O&T!Q![&T#R#S&T#T#o&Tn5UUTSw`}!O&T!Q![&T#R#S&T#T#h&T#h#i5h#i#o&Tj5qUnW_Qw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y6T#Y#o&Tb6[S_Qw`}!O&T!Q![&T#R#S&T#T#o&Tf6oUTSw`}!O&T!Q![&T#R#S&T#T#c&T#c#d7R#d#o&Tb7WUw`}!O&T!Q![&T#R#S&T#T#g&T#g#h4R#h#o&Tf7qUTSw`}!O&T!Q![&T#R#S&T#T#W&T#W#X8T#X#o&Tb8[S]Qw`}!O&T!Q![&T#R#S&T#T#o&Tn8oWTSw`}!O&T!Q![&T#R#S&T#T#]&T#]#^9X#^#h&T#h#i5h#i#o&Th9^Uw`}!O&T!Q![&T#R#S&T#T#_&T#_#`9p#`#o&Th9uUw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y.a#Y#o&Tf:`UTSw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y:r#Y#o&Tb:wUw`}!O&T!Q![&T#R#S&T#T#h&T#h#i;Z#i#o&Tb;`Uw`}!O&T!Q![&T#R#S&T#T#[&T#[#];r#]#o&Tb;wUw`}!O&T!Q![&T#R#S&T#T#c&T#c#d<Z#d#o&Tb<`Uw`}!O&T!Q![&T#R#S&T#T#W&T#W#X4j#X#o&Tn<y[TSw`}!O&T!Q![&T#R#S&T#T#V&T#V#W=o#W#X&T#X#Y3l#Y#`&T#`#a>o#a#f&T#f#g?W#g#o&Th=tUw`}!O&T!Q![&T#R#S&T#T#c&T#c#d>W#d#o&Th>]Uw`}!O&T!Q![&T#R#S&T#T#b&T#b#c-x#c#o&Th>tUw`}!O&T!Q![&T#R#S&T#T#]&T#]#^9X#^#o&Th?]Uw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y?o#Y#o&Th?tUw`}!O&T!Q![&T#R#S&T#T#Z&T#Z#[@W#[#o&Th@]Uw`}!O&T!Q![&T#R#S&T#T#X&T#X#Y@o#Y#o&Th@tUw`}!O&T!Q![&T#R#S&T#T#l&T#l#mAW#m#o&ThA_ShWw`}!O&T!Q![&T#R#S&T#T#o&TfArUTSw`}!O&T!Q![&T#R#S&T#T#f&T#f#gBU#g#o&TbB]SzQw`}!O&T!Q![&T#R#S&T#T#o&TfBpXTSw`}!O&T!Q![&T#R#S&T#T#UC]#U#c&T#c#dD]#d#f&T#f#gEp#g#o&TbCbUw`}!O&T!Q![&T#R#S&T#T#h&T#h#iCt#i#o&TbCyUw`}!O&T!Q![&T#R#S&T#T#[&T#[#]4j#]#o&TbDbUw`}!O&T!Q![&T#R#S&T#T#f&T#f#gDt#g#o&TbDyUw`}!O&T!Q![&T#R#S&T#T#h&T#h#iE]#i#o&TbEdSdQw`}!O&T!Q![&T#R#S&T#T#o&TbEuUw`}!O&T!Q![&T#R#S&T#T#X&T#X#YFX#Y#o&TbF^Uw`}!O&T!Q![&T#R#S&T#T#g&T#g#hFp#h#o&TbFuUw`}!O&T!Q![&T#R#S&T#T#X&T#X#YGX#Y#o&TbG^Uw`}!O&T!Q![&T#R#S&T#T#h&T#h#iGp#i#o&TbGwStQw`}!O&T!Q![&T#R#S&T#T#o&TfH[UTSw`}!O&T!Q![&T#R#S&T#T#i&T#i#jHn#j#o&TbHsUw`}!O&T!Q![&T#R#S&T#T#X&T#X#YIV#Y#o&TbI[Uw`}!O&T!Q![&T#R#S&T#T#f&T#f#gIn#g#o&TbIsUw`}!O&T!Q![&T#R#S&T#T#m&T#m#n4j#n#o&TnJ^XTSw`}!O&T!Q![&T#R#S&T#T#UJy#U#X&T#X#YKw#Y#c&T#c#dM{#d#o&TjKOUw`}!O&T!Q![&T#R#S&T#T#k&T#k#lKb#l#o&TjKkSeQrWw`}!O&T!Q![&T#R#S&T#T#o&TjK|Yw`}!O&T!Q![&T#R#S&T#T#Z&T#Z#[@W#[#e&T#e#fLl#f#g&T#g#hMP#h#o&TbLsScQw`}!O&T!Q![&T#R#S&T#T#o&TbMUUw`}!O&T!Q![&T#R#S&T#T#d&T#d#eMh#e#o&TbMoSpQw`}!O&T!Q![&T#R#S&T#T#o&TjNQWw`}!O&T!Q![&T#R#S&T#T#i&T#i#jNj#j#k&T#k#l!#j#l#o&ThNoUw`}!O&T!Q![&T#R#S&T#T#b&T#b#c! R#c#o&Th! WUw`}!O&T!Q![&T#R#S&T#T#W&T#W#X! j#X#o&Th! oUw`}!O&T!Q![&T#R#S&T#T#h&T#h#i!!R#i#o&Th!!WUw`}!O&T!Q![&T#R#S&T#T#f&T#f#g!!j#g#o&Th!!oUw`}!O&T!Q![&T#R#S&T#T#]&T#]#^!#R#^#o&Th!#WUw`}!O&T!Q![&T#R#S&T#T#d&T#d#e-e#e#o&Tb!#qSZQw`}!O&T!Q![&T#R#S&T#T#o&TS!$QP;=`<%l%W",
+    "!'U~R!^X^$}pq%Sqr%Zrs%`sx%Zxy%eyz%lz}%Z}!O%s!O!P&i!P!Q&p!Q![&w![!]'q!]!c%Z!c!d'x!d!q%Z!q!r(]!r#O%Z#O#P(j#P#R%Z#R#S%s#S#T%Z#T#U*[#U#V%s#V#W+q#W#X%s#X#Y3O#Y#Z%s#Z#[5Q#[#]6k#]#^7m#^#`%s#`#a8k#a#b:[#b#c<u#c#dAn#d#eBl#e#fHW#f#gJY#g#h!$Q#h#o%s#o#y%Z#y#z%S#z$f%Z$f$g%S$g#BY%Z#BY#BZ%S#BZ$IS%Z$IS$I_%S$I_$I|%Z$I|$JO%S$JO$JT%Z$JT$JU%S$JU$KV%Z$KV$KW%S$KW&FU%Z&FU&FV%S&FV;'S%Z;'S;=`!'O<%lO%Zj%SO!Sjn%ZOTS!SjS%`OTS~%eO!T~U%lOVQTSU%sOUQTSd%zSTSw`}!O&W!Q![&W#R#S&W#T#o&W`&]Sw`}!O&W!Q![&W#R#S&W#T#o&WU&pO[QTSU&wO!UQTSf'QSaQTSw`}!O&W!Q!['^#R#S&W#T#o&Wb'eSaQw`}!O&W!Q!['^#R#S&W#T#o&WU'xO`QTSU'}PTS!p!q(QQ(TP!f!g(WQ(]O|QU(bPTS!t!u(eQ(jO}QS(mXrs%Z!P!Q%Z#O#P%Z#U#V%Z#Y#Z%Z#b#c%Z#f#g%Z#h#i%Z#i#j)YS)]R!Q![)f!c!i)f#T#Z)fS)iR!Q![)r!c!i)r#T#Z)rS)uR!Q![*O!c!i*O#T#Z*OS*RR!Q![%Z!c!i%Z#T#Z%Zf*cUTSw`}!O&W!Q![&W#R#S&W#T#b&W#b#c*u#c#o&Wb*zUw`}!O&W!Q![&W#R#S&W#T#W&W#W#X+^#X#o&Wb+eS|Qw`}!O&W!Q![&W#R#S&W#T#o&Wn+xWTSw`}!O&W!Q![&W#R#S&W#T#c&W#c#d,b#d#f&W#f#g.w#g#o&Wh,gWw`}!O&W!Q![&W#R#S&W#T#W&W#W#X-P#X#b&W#b#c-{#c#o&Wh-UUw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y-h#Y#o&Wh-oSqWw`}!O&W!Q![&W#R#S&W#T#o&Wh.QUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i.d#i#o&Wh.kSgWw`}!O&W!Q![&W#R#S&W#T#o&Wb.|Uw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y/`#Y#o&Wb/eTw`}!O&W!Q![&W#R#S&W#T#U/t#U#o&Wb/yUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i0]#i#o&Wb0bUw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y0t#Y#o&Wb0yUw`}!O&W!Q![&W#R#S&W#T#W&W#W#X1]#X#o&Wb1bSw`}!O&W!Q![&W#R#S1n#T#o&Wb1sTw`}!O&W!Q![&W#R#S&W#T#U2S#U#o&Wb2XUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i2k#i#o&Wb2rSlQw`}!O&W!Q![&W#R#S&W#T#o&Wn3VWTSw`}!O&W!Q![&W#R#S&W#T#e&W#e#f3o#f#l&W#l#m4U#m#o&Wj3xS_QgWw`}!O&W!Q![&W#R#S&W#T#o&Wb4ZUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i4m#i#o&Wb4tSeQw`}!O&W!Q![&W#R#S&W#T#o&Wn5XUTSw`}!O&W!Q![&W#R#S&W#T#h&W#h#i5k#i#o&Wj5tUnW_Qw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y6W#Y#o&Wb6_S_Qw`}!O&W!Q![&W#R#S&W#T#o&Wf6rUTSw`}!O&W!Q![&W#R#S&W#T#c&W#c#d7U#d#o&Wb7ZUw`}!O&W!Q![&W#R#S&W#T#g&W#g#h4U#h#o&Wf7tUTSw`}!O&W!Q![&W#R#S&W#T#W&W#W#X8W#X#o&Wb8_S]Qw`}!O&W!Q![&W#R#S&W#T#o&Wn8rWTSw`}!O&W!Q![&W#R#S&W#T#]&W#]#^9[#^#h&W#h#i5k#i#o&Wh9aUw`}!O&W!Q![&W#R#S&W#T#_&W#_#`9s#`#o&Wh9xUw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y.d#Y#o&Wf:cUTSw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y:u#Y#o&Wb:zUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i;^#i#o&Wb;cUw`}!O&W!Q![&W#R#S&W#T#[&W#[#];u#]#o&Wb;zUw`}!O&W!Q![&W#R#S&W#T#c&W#c#d<^#d#o&Wb<cUw`}!O&W!Q![&W#R#S&W#T#W&W#W#X4m#X#o&Wn<|[TSw`}!O&W!Q![&W#R#S&W#T#V&W#V#W=r#W#X&W#X#Y3o#Y#`&W#`#a>r#a#f&W#f#g?Z#g#o&Wh=wUw`}!O&W!Q![&W#R#S&W#T#c&W#c#d>Z#d#o&Wh>`Uw`}!O&W!Q![&W#R#S&W#T#b&W#b#c-{#c#o&Wh>wUw`}!O&W!Q![&W#R#S&W#T#]&W#]#^9[#^#o&Wh?`Uw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y?r#Y#o&Wh?wUw`}!O&W!Q![&W#R#S&W#T#Z&W#Z#[@Z#[#o&Wh@`Uw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y@r#Y#o&Wh@wUw`}!O&W!Q![&W#R#S&W#T#l&W#l#mAZ#m#o&WhAbShWw`}!O&W!Q![&W#R#S&W#T#o&WfAuUTSw`}!O&W!Q![&W#R#S&W#T#f&W#f#gBX#g#o&WbB`S}Qw`}!O&W!Q![&W#R#S&W#T#o&WfBsXTSw`}!O&W!Q![&W#R#S&W#T#UC`#U#c&W#c#dD`#d#f&W#f#gEs#g#o&WbCeUw`}!O&W!Q![&W#R#S&W#T#h&W#h#iCw#i#o&WbC|Uw`}!O&W!Q![&W#R#S&W#T#[&W#[#]4m#]#o&WbDeUw`}!O&W!Q![&W#R#S&W#T#f&W#f#gDw#g#o&WbD|Uw`}!O&W!Q![&W#R#S&W#T#h&W#h#iE`#i#o&WbEgSdQw`}!O&W!Q![&W#R#S&W#T#o&WbExUw`}!O&W!Q![&W#R#S&W#T#X&W#X#YF[#Y#o&WbFaUw`}!O&W!Q![&W#R#S&W#T#g&W#g#hFs#h#o&WbFxUw`}!O&W!Q![&W#R#S&W#T#X&W#X#YG[#Y#o&WbGaUw`}!O&W!Q![&W#R#S&W#T#h&W#h#iGs#i#o&WbGzStQw`}!O&W!Q![&W#R#S&W#T#o&WfH_UTSw`}!O&W!Q![&W#R#S&W#T#i&W#i#jHq#j#o&WbHvUw`}!O&W!Q![&W#R#S&W#T#X&W#X#YIY#Y#o&WbI_Uw`}!O&W!Q![&W#R#S&W#T#f&W#f#gIq#g#o&WbIvUw`}!O&W!Q![&W#R#S&W#T#m&W#m#n4m#n#o&WnJaXTSw`}!O&W!Q![&W#R#S&W#T#UJ|#U#X&W#X#YKz#Y#c&W#c#dNO#d#o&WjKRUw`}!O&W!Q![&W#R#S&W#T#k&W#k#lKe#l#o&WjKnSeQrWw`}!O&W!Q![&W#R#S&W#T#o&WjLPYw`}!O&W!Q![&W#R#S&W#T#Z&W#Z#[@Z#[#e&W#e#fLo#f#g&W#g#hMS#h#o&WbLvScQw`}!O&W!Q![&W#R#S&W#T#o&WbMXUw`}!O&W!Q![&W#R#S&W#T#d&W#d#eMk#e#o&WbMrSpQw`}!O&W!Q![&W#R#S&W#T#o&WjNTWw`}!O&W!Q![&W#R#S&W#T#i&W#i#jNm#j#k&W#k#l!#m#l#o&WhNrUw`}!O&W!Q![&W#R#S&W#T#b&W#b#c! U#c#o&Wh! ZUw`}!O&W!Q![&W#R#S&W#T#W&W#W#X! m#X#o&Wh! rUw`}!O&W!Q![&W#R#S&W#T#h&W#h#i!!U#i#o&Wh!!ZUw`}!O&W!Q![&W#R#S&W#T#f&W#f#g!!m#g#o&Wh!!rUw`}!O&W!Q![&W#R#S&W#T#]&W#]#^!#U#^#o&Wh!#ZUw`}!O&W!Q![&W#R#S&W#T#d&W#d#e-h#e#o&Wb!#tSZQw`}!O&W!Q![&W#R#S&W#T#o&Wf!$XUTSw`}!O&W!Q![&W#R#S&W#T#c&W#c#d!$k#d#o&Wb!$pUw`}!O&W!Q![&W#R#S&W#T#i&W#i#j!%S#j#o&Wb!%XUw`}!O&W!Q![&W#R#S&W#T#f&W#f#g!%k#g#o&Wb!%pUw`}!O&W!Q![&W#R#S&W#T#V&W#V#W!&S#W#o&Wb!&XUw`}!O&W!Q![&W#R#S&W#T#X&W#X#Y!&k#Y#o&Wb!&rSyQw`}!O&W!Q![&W#R#S&W#T#o&WS!'RP;=`<%l%Z",
   tokenizers: [
     1,
     2,
     3,
     4,
     new LocalTokenGroup(
-      "x~RQ!P!QX#O#P^~^Ok~~aRO;'Sj;'S;=`o;=`Oj~oO!T~~tP!T~;=`<%lj~",
+      "x~RQ!P!QX#O#P^~^Ok~~aRO;'Sj;'S;=`o;=`Oj~oO!W~~tP!W~;=`<%lj~",
       39,
-      50,
+      53,
     ),
   ],
   topRules: { HTTPQL: [0, 1] },

js/src/primitives.ts

@@ -4,6 +4,7 @@ export type Query = {
   AND?: Maybe<[Query, Query]>;
   OR?: Maybe<[Query, Query]>;
   row?: Maybe<ClauseRow>;
+  source?: Maybe<ExprSource>;
   preset?: Maybe<ExprPreset>;
   request?: Maybe<ClauseRequest>;
   response?: Maybe<ClauseResponse>;
@@ -37,6 +38,8 @@ export type ExprInt = {
 
 export type ExprPreset = { alias: string } | { name: string };
 
+export type ExprSource = { name: string };
+
 export type ExprString = {
   operator: OperatorString;
   value: string;

js/src/serialize.ts

@@ -8,6 +8,7 @@ import type {
   ExprDate,
   ExprInt,
   ExprPreset,
+  ExprSource,
   ExprString,
   Query,
 } from "./primitives.js";
@@ -26,6 +27,9 @@ const serializeClauseRequestResponse = (
   if (isPresent(query.preset)) {
     return serializeExprPreset(query.preset);
   }
+  if (isPresent(query.source)) {
+    return serializeExprSource(query.source);
+  }
   if (isPresent(query.request)) {
     return serializeClauseRequest(query.request).map((str) => `req.${str}`);
   }
@@ -134,3 +138,9 @@ const serializeExprString = (
 const serializeExprDate = (value: ExprDate): Result<string, HTTPQLError> => {
   return ok(`${value.operator.toLowerCase()}:"${value.value}"`);
 };
+
+const serializeExprSource = (
+  value: ExprSource,
+): Result<string, HTTPQLError> => {
+  return ok(`source:"${value.name}"`);
+};

rust/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["Caido Labs Inc. <[email protected]>"]
 description = "Parser for the HTTPQL language"
 repository = "https://github.com/caido/httpql"
 license = "MIT"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 [dependencies]

rust/httpql.pest

@@ -16,6 +16,7 @@ RowNamespace      = _{ "row" }
 RequestNamespace  = _{ "req" }
 ResponseNamespace = _{ "resp" }
 PresetNamespace   = _{ "preset" }
+SourceNamespace   = _{ "source" }
 
 // Row field names
 RowIntFieldName = { "id" }
@@ -61,6 +62,7 @@ StringExpression      = ${ StringOperator ~ Colon ~ StringValue | RegexOperator
 DateExpression        = ${ DateOperator ~ Colon ~ StringValue }
 PresetNameExpression  =  { StringValue }
 PresetAliasExpression =  { SymbolValue }
+SourceNameExpression  =  { StringValue }
 
 // Clause
 StringClause = { StringValue }
@@ -82,7 +84,11 @@ PresetClause = ${
     PresetNamespace ~ Colon ~ (PresetNameExpression | PresetAliasExpression)
 }
 
+SourceClause = ${
+    SourceNamespace ~ Colon ~ SourceNameExpression
+}
+
 // Query
-Clause          = _{ StringClause | RowClause | RequestClause | ResponseClause | PresetClause | LeftParen ~ Query ~ RightParen }
+Clause          = _{ StringClause | RowClause | RequestClause | ResponseClause | PresetClause | SourceClause | LeftParen ~ Query ~ RightParen }
 LogicalOperator = _{ And | Or }
 Query           =  { Clause ~ (LogicalOperator ~ Clause)* }

rust/src/lib.rs

@@ -38,6 +38,7 @@ mod tests {
     #[case(7)]
     #[case(8)]
     #[case(9)]
+    #[case(10)]
     fn test_ast(#[case] case: u32) {
         let input = std::fs::read_to_string(format!("../tests/ast/{case}/input.httpql")).unwrap();
         let output = std::fs::read_to_string(format!("../tests/ast/{case}/output.ast")).unwrap();