flowquery 1.0.17 → 1.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gitattributes +3 -0
- package/.github/workflows/python-publish.yml +58 -7
- package/.github/workflows/release.yml +25 -18
- package/README.md +37 -32
- package/dist/flowquery.min.js +1 -1
- package/dist/graph/data.d.ts.map +1 -1
- package/dist/graph/data.js +5 -3
- package/dist/graph/data.js.map +1 -1
- package/dist/graph/pattern.d.ts.map +1 -1
- package/dist/graph/pattern.js +11 -4
- package/dist/graph/pattern.js.map +1 -1
- package/dist/graph/pattern_expression.d.ts +1 -0
- package/dist/graph/pattern_expression.d.ts.map +1 -1
- package/dist/graph/pattern_expression.js +14 -3
- package/dist/graph/pattern_expression.js.map +1 -1
- package/dist/graph/relationship.d.ts.map +1 -1
- package/dist/graph/relationship.js +11 -4
- package/dist/graph/relationship.js.map +1 -1
- package/dist/index.d.ts +0 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/parsing/parser.d.ts +5 -0
- package/dist/parsing/parser.d.ts.map +1 -1
- package/dist/parsing/parser.js +94 -73
- package/dist/parsing/parser.js.map +1 -1
- package/docs/flowquery.min.js +1 -1
- package/flowquery-py/CONTRIBUTING.md +127 -0
- package/flowquery-py/README.md +13 -112
- package/flowquery-py/misc/data/test.json +10 -0
- package/flowquery-py/misc/data/users.json +242 -0
- package/flowquery-py/notebooks/TestFlowQuery.ipynb +440 -0
- package/flowquery-py/pyproject.toml +4 -1
- package/flowquery-py/src/__init__.py +2 -0
- package/flowquery-py/src/graph/data.py +4 -3
- package/flowquery-py/src/graph/pattern.py +7 -4
- package/flowquery-py/src/graph/pattern_expression.py +6 -3
- package/flowquery-py/src/graph/relationship.py +7 -0
- package/flowquery-py/src/io/command_line.py +44 -2
- package/flowquery-py/src/parsing/base_parser.py +2 -2
- package/flowquery-py/src/parsing/operations/load.py +6 -0
- package/flowquery-py/src/parsing/parser.py +78 -62
- package/flowquery-py/src/tokenization/token.py +122 -176
- package/flowquery-py/src/tokenization/tokenizer.py +4 -4
- package/flowquery-py/tests/compute/test_runner.py +10 -7
- package/flowquery-py/tests/parsing/test_parser.py +6 -0
- package/flowquery-vscode/flowQueryEngine/flowquery.min.js +1 -1
- package/package.json +1 -1
- package/src/graph/data.ts +5 -3
- package/src/graph/pattern.ts +13 -4
- package/src/graph/pattern_expression.ts +14 -3
- package/src/graph/relationship.ts +8 -0
- package/src/index.ts +5 -6
- package/src/parsing/parser.ts +93 -69
- package/tests/compute/runner.test.ts +71 -79
- package/tests/parsing/parser.test.ts +8 -0
package/dist/graph/data.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/graph/data.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IACZ,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,MAAM,CAAc;gBAEhB,SAAS,GAAE,MAAM,EAAO;IAG7B,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAGlC,IAAW,QAAQ,IAAI,MAAM,CAE5B;IACM,KAAK,IAAI,IAAI;IAGb,IAAI,IAAI,OAAO;IAOf,KAAK,IAAI,UAAU;CAG7B;AAED,cAAM,KAAK;IACP,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,QAAQ,CAAc;gBAClB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAG1C,IAAW,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAE1C;IACD,IAAW,OAAO,IAAI,MAAM,CAE3B;IACD,IAAW,OAAO,CAAC,KAAK,EAAE,MAAM,EAE/B;CACJ;AAED,cAAM,IAAI;IACN,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAM;IAC/C,OAAO,CAAC,OAAO,CAAiC;gBAEpC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAO;IAI/C,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,IAAI;IAWpD,KAAK,CAAC,KAAK,GAAE,MAAU,GAAG,KAAK;IAWtC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO;IAejD,KAAK,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/graph/data.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IACZ,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,MAAM,CAAc;gBAEhB,SAAS,GAAE,MAAM,EAAO;IAG7B,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAGlC,IAAW,QAAQ,IAAI,MAAM,CAE5B;IACM,KAAK,IAAI,IAAI;IAGb,IAAI,IAAI,OAAO;IAOf,KAAK,IAAI,UAAU;CAG7B;AAED,cAAM,KAAK;IACP,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,QAAQ,CAAc;gBAClB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAG1C,IAAW,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAE1C;IACD,IAAW,OAAO,IAAI,MAAM,CAE3B;IACD,IAAW,OAAO,CAAC,KAAK,EAAE,MAAM,EAE/B;CACJ;AAED,cAAM,IAAI;IACN,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAM;IAC/C,OAAO,CAAC,OAAO,CAAiC;gBAEpC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAO;IAI/C,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,IAAI;IAWpD,KAAK,CAAC,KAAK,GAAE,MAAU,GAAG,KAAK;IAWtC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO;IAejD,KAAK,IAAI,IAAI;IAQb,IAAI,CAAC,KAAK,GAAE,MAAU,GAAG,OAAO;IAOhC,OAAO,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;CAMhE;AAED,eAAe,IAAI,CAAC"}
|
package/dist/graph/data.js
CHANGED
|
@@ -87,9 +87,11 @@ class Data {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
reset() {
|
|
90
|
-
this.
|
|
91
|
-
|
|
92
|
-
entry.
|
|
90
|
+
for (const layer of this._layers.values()) {
|
|
91
|
+
layer.current = -1;
|
|
92
|
+
for (const entry of layer.index.values()) {
|
|
93
|
+
entry.reset();
|
|
94
|
+
}
|
|
93
95
|
}
|
|
94
96
|
}
|
|
95
97
|
next(level = 0) {
|
package/dist/graph/data.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/graph/data.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/graph/data.ts"],"names":[],"mappings":";;AAAA,MAAM,UAAU;IAIZ,YAAY,YAAsB,EAAE;QAF5B,WAAM,GAAW,CAAC,CAAC,CAAC;QAGxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IACM,GAAG,CAAC,QAAgB;QACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IACD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IACM,KAAK;QACR,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrB,CAAC;IACM,IAAI;QACP,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACM,KAAK;QACR,OAAO,IAAI,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAChD,CAAC;CACJ;AAED,MAAM,KAAK;IAGP,YAAY,KAA8B;QAFlC,WAAM,GAA4B,IAAI,GAAG,EAAE,CAAC;QAC5C,aAAQ,GAAW,CAAC,CAAC,CAAC;QAE1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD,IAAW,OAAO,CAAC,KAAa;QAC5B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC1B,CAAC;CACJ;AAED,MAAM,IAAI;IAIN,YAAY,UAAiC,EAAE;QAHrC,aAAQ,GAA0B,EAAE,CAAC;QACvC,YAAO,GAAuB,IAAI,GAAG,EAAE,CAAC;QAG5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;IACS,WAAW,CAAC,GAAW,EAAE,QAAgB,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvD,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACM,KAAK,CAAC,QAAgB,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;YACnC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;YAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACrC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACnC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;IACpC,CAAC;IACS,KAAK,CAAC,GAAW,EAAE,QAAgB,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,cAAc;YAChE,OAAO,KAAK,CAAC;QACjB,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;YAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,cAAc;gBAChE,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC3C,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACM,KAAK;QACR,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YACnB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBACvC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC;QACL,CAAC;IACL,CAAC;IACM,IAAI,CAAC,QAAgB,CAAC;QACzB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACM,OAAO,CAAC,QAAgB,CAAC;QAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED,kBAAe,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pattern.d.ts","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAE1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,cAAM,OAAQ,SAAQ,OAAO;IACzB,OAAO,CAAC,WAAW,CAAuB;IAC1C,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,GAAG,YAAY,CAAC,EAAE,CAAM;IAC/C,IAAW,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAEtC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACM,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI;IAsBrD,IAAW,KAAK,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,EAAE,CAE1C;IACD,IAAW,SAAS,IAAI,IAAI,CAS3B;IACD,IAAW,OAAO,IAAI,IAAI,CASzB;IACM,KAAK,IAAI,GAAG;IAGX,MAAM,IAAI,SAAS,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"pattern.d.ts","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAE1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,cAAM,OAAQ,SAAQ,OAAO;IACzB,OAAO,CAAC,WAAW,CAAuB;IAC1C,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,GAAG,YAAY,CAAC,EAAE,CAAM;IAC/C,IAAW,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAEtC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACM,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI;IAsBrD,IAAW,KAAK,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,EAAE,CAE1C;IACD,IAAW,SAAS,IAAI,IAAI,CAS3B;IACD,IAAW,OAAO,IAAI,IAAI,CASzB;IACM,KAAK,IAAI,GAAG;IAGX,MAAM,IAAI,SAAS,CAAC,GAAG,CAAC;IAyBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAiB1C;AACD,eAAe,OAAO,CAAC"}
|
package/dist/graph/pattern.js
CHANGED
|
@@ -75,18 +75,25 @@ class Pattern extends ast_node_1.default {
|
|
|
75
75
|
return Array.from(this.values());
|
|
76
76
|
}
|
|
77
77
|
*values() {
|
|
78
|
-
for (
|
|
78
|
+
for (let i = 0; i < this._chain.length; i++) {
|
|
79
|
+
const element = this._chain[i];
|
|
79
80
|
if (element instanceof node_1.default) {
|
|
81
|
+
// Skip node if previous element was a zero-hop relationship (no matches)
|
|
82
|
+
if (i > 0 &&
|
|
83
|
+
this._chain[i - 1] instanceof relationship_1.default &&
|
|
84
|
+
this._chain[i - 1].matches.length === 0) {
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
80
87
|
yield element.value();
|
|
81
88
|
}
|
|
82
89
|
else if (element instanceof relationship_1.default) {
|
|
83
|
-
let
|
|
90
|
+
let j = 0;
|
|
84
91
|
for (const match of element.matches) {
|
|
85
92
|
yield match;
|
|
86
|
-
if (
|
|
93
|
+
if (j < element.matches.length - 1) {
|
|
87
94
|
yield match.endNode;
|
|
88
95
|
}
|
|
89
|
-
|
|
96
|
+
j++;
|
|
90
97
|
}
|
|
91
98
|
}
|
|
92
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,mEAA0C;AAC1C,0DAAkC;AAClC,kDAA0B;AAE1B,sEAA6C;AAC7C,kEAA0C;AAE1C,sFAA6D;AAE7D,MAAM,OAAQ,SAAQ,kBAAO;IAA7B;;QACY,gBAAW,GAAkB,IAAI,CAAC;QAChC,WAAM,GAA4B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pattern_expression.d.ts","sourceRoot":"","sources":["../../src/graph/pattern_expression.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,cAAM,iBAAkB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAkB;IACrC,IAAW,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAEtC;IACM,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"pattern_expression.d.ts","sourceRoot":"","sources":["../../src/graph/pattern_expression.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,cAAM,iBAAkB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAkB;IACrC,IAAW,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,EAEtC;IACM,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI;IAG9C,MAAM,IAAI,IAAI;IAcR,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B,KAAK,IAAI,OAAO;IAGV,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAO1C;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -24,11 +24,22 @@ class PatternExpression extends pattern_1.default {
|
|
|
24
24
|
throw new Error("Cannot set identifier on PatternExpression");
|
|
25
25
|
}
|
|
26
26
|
addElement(element) {
|
|
27
|
-
if (this._chain.length == 0 && !(element instanceof node_reference_1.default)) {
|
|
28
|
-
throw new Error("PatternExpression must start with a NodeReference");
|
|
29
|
-
}
|
|
30
27
|
super.addElement(element);
|
|
31
28
|
}
|
|
29
|
+
verify() {
|
|
30
|
+
if (this._chain.length === 0) {
|
|
31
|
+
throw new Error("PatternExpression must contain at least one element");
|
|
32
|
+
}
|
|
33
|
+
const referenced = this._chain.some((element) => {
|
|
34
|
+
if (element instanceof node_reference_1.default) {
|
|
35
|
+
return true;
|
|
36
|
+
}
|
|
37
|
+
return false;
|
|
38
|
+
});
|
|
39
|
+
if (!referenced) {
|
|
40
|
+
throw new Error("PatternExpression must contain at least one NodeReference");
|
|
41
|
+
}
|
|
42
|
+
}
|
|
32
43
|
evaluate() {
|
|
33
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
45
|
this._evaluation = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pattern_expression.js","sourceRoot":"","sources":["../../src/graph/pattern_expression.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sEAA6C;AAC7C,wDAAgC;AAGhC,MAAM,iBAAkB,SAAQ,iBAAO;IAAvC;;QACY,aAAQ,GAAY,KAAK,CAAC;QAC1B,gBAAW,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"pattern_expression.js","sourceRoot":"","sources":["../../src/graph/pattern_expression.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sEAA6C;AAC7C,wDAAgC;AAGhC,MAAM,iBAAkB,SAAQ,iBAAO;IAAvC;;QACY,aAAQ,GAAY,KAAK,CAAC;QAC1B,gBAAW,GAAY,KAAK,CAAC;IAsCzC,CAAC;IArCG,IAAW,UAAU,CAAC,EAAiB;QACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC;IACM,UAAU,CAAC,OAA4B;QAC1C,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACM,MAAM;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,OAAO,YAAY,wBAAa,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;IACY,QAAQ;;YACjB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAS,EAAE;gBAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAC5B,CAAC,CAAA,CAAC;YACF,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;KAAA;IACM,KAAK;QACR,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACY,SAAS;;;;;YAClB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO;YACX,CAAC;YACD,MAAM,OAAM,SAAS,WAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACzB,CAAC;KAAA;CACJ;AAED,kBAAe,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship.d.ts","sourceRoot":"","sources":["../../src/graph/relationship.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,gBAAwC,MAAM,qBAAqB,CAAC;AAC3E,OAAO,0BAA0B,EAAE,EAC/B,uBAAuB,EAC1B,MAAM,gCAAgC,CAAC;AAExC,cAAM,YAAa,SAAQ,OAAO;IAC9B,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IACtC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC3D,SAAS,CAAC,KAAK,EAAE,IAAI,CAAc;IAEnC,SAAS,CAAC,MAAM,EAAE,uBAAuB,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAQ;IACpF,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAoC;IAElF,SAAS,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;IACtC,SAAS,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEtC,OAAO,CAAC,KAAK,CAAiC;gBAElC,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW;IAKxE,IAAW,UAAU,CAAC,UAAU,EAAE,MAAM,EAEvC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACD,IAAW,IAAI,CAAC,IAAI,EAAE,MAAM,EAE3B;IACD,IAAW,IAAI,IAAI,MAAM,GAAG,IAAI,CAE/B;IACD,IAAW,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE3C;IACM,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAGlD,IAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAEzB;IACD,IAAW,IAAI,IAAI,IAAI,GAAG,IAAI,CAE7B;IACM,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;IAIjD,IAAW,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAElC;IACD,IAAW,MAAM,IAAI,IAAI,GAAG,IAAI,CAE/B;IACD,IAAW,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAElC;IACD,IAAW,MAAM,IAAI,IAAI,GAAG,IAAI,CAE/B;IACM,KAAK,IAAI,uBAAuB,GAAG,uBAAuB,EAAE,GAAG,IAAI;IAG1E,IAAW,OAAO,IAAI,uBAAuB,EAAE,CAE9C;IACM,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,GAAG,IAAI;IAG5C,OAAO,IAAI,gBAAgB,GAAG,IAAI;IAGlC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAGtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"relationship.d.ts","sourceRoot":"","sources":["../../src/graph/relationship.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,gBAAwC,MAAM,qBAAqB,CAAC;AAC3E,OAAO,0BAA0B,EAAE,EAC/B,uBAAuB,EAC1B,MAAM,gCAAgC,CAAC;AAExC,cAAM,YAAa,SAAQ,OAAO;IAC9B,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IACtC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC3D,SAAS,CAAC,KAAK,EAAE,IAAI,CAAc;IAEnC,SAAS,CAAC,MAAM,EAAE,uBAAuB,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAQ;IACpF,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAoC;IAElF,SAAS,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;IACtC,SAAS,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEtC,OAAO,CAAC,KAAK,CAAiC;gBAElC,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW;IAKxE,IAAW,UAAU,CAAC,UAAU,EAAE,MAAM,EAEvC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACD,IAAW,IAAI,CAAC,IAAI,EAAE,MAAM,EAE3B;IACD,IAAW,IAAI,IAAI,MAAM,GAAG,IAAI,CAE/B;IACD,IAAW,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE3C;IACM,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAGlD,IAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAEzB;IACD,IAAW,IAAI,IAAI,IAAI,GAAG,IAAI,CAE7B;IACM,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;IAIjD,IAAW,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAElC;IACD,IAAW,MAAM,IAAI,IAAI,GAAG,IAAI,CAE/B;IACD,IAAW,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAElC;IACD,IAAW,MAAM,IAAI,IAAI,GAAG,IAAI,CAE/B;IACM,KAAK,IAAI,uBAAuB,GAAG,uBAAuB,EAAE,GAAG,IAAI;IAG1E,IAAW,OAAO,IAAI,uBAAuB,EAAE,CAE9C;IACM,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,GAAG,IAAI;IAG5C,OAAO,IAAI,gBAAgB,GAAG,IAAI;IAGlC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAGtB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAmCrE;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -91,7 +91,7 @@ class Relationship extends ast_node_1.default {
|
|
|
91
91
|
}
|
|
92
92
|
find(left_id_1) {
|
|
93
93
|
return __awaiter(this, arguments, void 0, function* (left_id, hop = 0) {
|
|
94
|
-
var _a, _b, _c, _d;
|
|
94
|
+
var _a, _b, _c, _d, _e;
|
|
95
95
|
// Save original source node
|
|
96
96
|
const original = this._source;
|
|
97
97
|
if (hop > 0) {
|
|
@@ -100,12 +100,19 @@ class Relationship extends ast_node_1.default {
|
|
|
100
100
|
}
|
|
101
101
|
if (hop === 0) {
|
|
102
102
|
(_a = this._data) === null || _a === void 0 ? void 0 : _a.reset();
|
|
103
|
+
// Handle zero-hop case: when min is 0 on a variable-length relationship,
|
|
104
|
+
// match source node as target (no traversal)
|
|
105
|
+
if (((_b = this.hops) === null || _b === void 0 ? void 0 : _b.multi()) && this.hops.min === 0 && this._target) {
|
|
106
|
+
// For zero-hop, target finds the same node as source (left_id)
|
|
107
|
+
// No relationship match is pushed since no edge is traversed
|
|
108
|
+
yield this._target.find(left_id, hop);
|
|
109
|
+
}
|
|
103
110
|
}
|
|
104
|
-
while ((
|
|
105
|
-
const data = (
|
|
111
|
+
while ((_c = this._data) === null || _c === void 0 ? void 0 : _c.find(left_id, hop)) {
|
|
112
|
+
const data = (_d = this._data) === null || _d === void 0 ? void 0 : _d.current(hop);
|
|
106
113
|
if (hop >= this.hops.min) {
|
|
107
114
|
this.setValue(this);
|
|
108
|
-
yield ((
|
|
115
|
+
yield ((_e = this._target) === null || _e === void 0 ? void 0 : _e.find(data.right_id, hop));
|
|
109
116
|
if (this._matches.isCircular()) {
|
|
110
117
|
throw new Error("Circular relationship detected");
|
|
111
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship.js","sourceRoot":"","sources":["../../src/graph/relationship.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"relationship.js","sourceRoot":"","sources":["../../src/graph/relationship.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
6
|
/**
|
|
3
7
|
* FlowQuery - A declarative query language for data processing pipelines.
|
|
4
8
|
*
|
|
5
|
-
*
|
|
9
|
+
* Main entry point for the FlowQuery command-line interface.
|
|
6
10
|
*
|
|
7
11
|
* @packageDocumentation
|
|
8
12
|
*/
|
|
9
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
-
};
|
|
12
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
const command_line_1 = __importDefault(require("./io/command_line"));
|
|
14
14
|
const commandLine = new command_line_1.default();
|
|
15
15
|
commandLine.loop();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;GAMG;AACH,qEAA4C;AAE5C,MAAM,WAAW,GAAG,IAAI,sBAAW,EAAE,CAAC;AACtC,WAAW,CAAC,IAAI,EAAE,CAAC"}
|
package/dist/parsing/parser.d.ts
CHANGED
|
@@ -49,6 +49,11 @@ declare class Parser extends BaseParser {
|
|
|
49
49
|
private parseSubQuery;
|
|
50
50
|
private parseLimit;
|
|
51
51
|
private parseExpressions;
|
|
52
|
+
/**
|
|
53
|
+
* Parse a single operand (without operators).
|
|
54
|
+
* @returns True if an operand was parsed, false otherwise.
|
|
55
|
+
*/
|
|
56
|
+
private parseOperand;
|
|
52
57
|
private parseExpression;
|
|
53
58
|
private parseLookup;
|
|
54
59
|
private parseCase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parsing/parser.ts"],"names":[],"mappings":"AAWA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,UAAU,MAAM,eAAe,CAAC;AAwCvC;;;;;;;;;;;;GAYG;AACH,cAAM,MAAO,SAAQ,UAAU;IAC3B,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,QAAQ,CAAa;IAE7B;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAKxC,OAAO,CAAC,eAAe;IAwDvB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,WAAW;IAiCnB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,SAAS;IAoEjB,OAAO,CAAC,SAAS;IA0BjB,OAAO,CAAC,WAAW;IA8DnB,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,SAAS;IA4CjB,OAAO,CAAE,aAAa;IAgCtB,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,sBAAsB;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parsing/parser.ts"],"names":[],"mappings":"AAWA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,UAAU,MAAM,eAAe,CAAC;AAwCvC;;;;;;;;;;;;GAYG;AACH,cAAM,MAAO,SAAQ,UAAU;IAC3B,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,QAAQ,CAAa;IAE7B;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAKxC,OAAO,CAAC,eAAe;IAwDvB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,WAAW;IAiCnB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,SAAS;IAoEjB,OAAO,CAAC,SAAS;IA0BjB,OAAO,CAAC,WAAW;IA8DnB,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,SAAS;IA4CjB,OAAO,CAAE,aAAa;IAgCtB,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,iBAAiB;IAyDzB,OAAO,CAAC,qBAAqB;IA6B7B,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAE,gBAAgB;IAsCzB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAmFpB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,WAAW;IAkDnB,OAAO,CAAC,SAAS;IAyCjB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,aAAa;IAiCrB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,sBAAsB;IAwE9B,OAAO,CAAC,YAAY;IA4BpB,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,qBAAqB;IAuC7B,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,kCAAkC;IAO1C,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,0CAA0C;CAKrD;AAED,eAAe,MAAM,CAAC"}
|
package/dist/parsing/parser.js
CHANGED
|
@@ -508,9 +508,6 @@ class Parser extends base_parser_1.default {
|
|
|
508
508
|
if (node === null) {
|
|
509
509
|
throw new Error("Expected node definition");
|
|
510
510
|
}
|
|
511
|
-
if (!(node instanceof node_reference_1.default)) {
|
|
512
|
-
throw new Error("PatternExpression must start with a NodeReference");
|
|
513
|
-
}
|
|
514
511
|
pattern.addElement(node);
|
|
515
512
|
let relationship = null;
|
|
516
513
|
while (true) {
|
|
@@ -528,6 +525,7 @@ class Parser extends base_parser_1.default {
|
|
|
528
525
|
}
|
|
529
526
|
pattern.addElement(node);
|
|
530
527
|
}
|
|
528
|
+
pattern.verify();
|
|
531
529
|
return pattern;
|
|
532
530
|
}
|
|
533
531
|
parseRelationship() {
|
|
@@ -606,10 +604,12 @@ class Parser extends base_parser_1.default {
|
|
|
606
604
|
}
|
|
607
605
|
this.setNextToken();
|
|
608
606
|
if (!this.token.isNumber()) {
|
|
609
|
-
|
|
607
|
+
hops.max = Number.MAX_SAFE_INTEGER;
|
|
608
|
+
}
|
|
609
|
+
else {
|
|
610
|
+
hops.max = parseInt(this.token.value || "0");
|
|
611
|
+
this.setNextToken();
|
|
610
612
|
}
|
|
611
|
-
hops.max = parseInt(this.token.value || "0");
|
|
612
|
-
this.setNextToken();
|
|
613
613
|
}
|
|
614
614
|
}
|
|
615
615
|
else {
|
|
@@ -682,82 +682,103 @@ class Parser extends base_parser_1.default {
|
|
|
682
682
|
this.setNextToken();
|
|
683
683
|
}
|
|
684
684
|
}
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
685
|
+
/**
|
|
686
|
+
* Parse a single operand (without operators).
|
|
687
|
+
* @returns True if an operand was parsed, false otherwise.
|
|
688
|
+
*/
|
|
689
|
+
parseOperand(expression) {
|
|
690
|
+
var _a, _b, _c, _d, _e;
|
|
691
|
+
this.skipWhitespaceAndComments();
|
|
692
|
+
if (this.token.isIdentifier() && !((_a = this.peek()) === null || _a === void 0 ? void 0 : _a.isLeftParenthesis())) {
|
|
693
|
+
const identifier = this.token.value || "";
|
|
694
|
+
const reference = new reference_1.default(identifier, this.variables.get(identifier));
|
|
695
|
+
this.setNextToken();
|
|
696
|
+
const lookup = this.parseLookup(reference);
|
|
697
|
+
expression.addNode(lookup);
|
|
698
|
+
return true;
|
|
699
|
+
}
|
|
700
|
+
else if (this.token.isIdentifier() && ((_b = this.peek()) === null || _b === void 0 ? void 0 : _b.isLeftParenthesis())) {
|
|
701
|
+
const func = this.parsePredicateFunction() || this.parseFunction();
|
|
702
|
+
if (func !== null) {
|
|
703
|
+
const lookup = this.parseLookup(func);
|
|
695
704
|
expression.addNode(lookup);
|
|
705
|
+
return true;
|
|
696
706
|
}
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
if (pattern !== null) {
|
|
708
|
-
expression.addNode(pattern);
|
|
709
|
-
}
|
|
707
|
+
}
|
|
708
|
+
else if (this.token.isLeftParenthesis() &&
|
|
709
|
+
(((_c = this.peek()) === null || _c === void 0 ? void 0 : _c.isIdentifier()) ||
|
|
710
|
+
((_d = this.peek()) === null || _d === void 0 ? void 0 : _d.isColon()) ||
|
|
711
|
+
((_e = this.peek()) === null || _e === void 0 ? void 0 : _e.isRightParenthesis()))) {
|
|
712
|
+
// Possible graph pattern expression
|
|
713
|
+
const pattern = this.parsePatternExpression();
|
|
714
|
+
if (pattern !== null) {
|
|
715
|
+
expression.addNode(pattern);
|
|
716
|
+
return true;
|
|
710
717
|
}
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
718
|
+
}
|
|
719
|
+
else if (this.token.isOperand()) {
|
|
720
|
+
expression.addNode(this.token.node);
|
|
721
|
+
this.setNextToken();
|
|
722
|
+
return true;
|
|
723
|
+
}
|
|
724
|
+
else if (this.token.isFString()) {
|
|
725
|
+
const f_string = this.parseFString();
|
|
726
|
+
if (f_string === null) {
|
|
727
|
+
throw new Error("Expected f-string");
|
|
714
728
|
}
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
729
|
+
expression.addNode(f_string);
|
|
730
|
+
return true;
|
|
731
|
+
}
|
|
732
|
+
else if (this.token.isLeftParenthesis()) {
|
|
733
|
+
this.setNextToken();
|
|
734
|
+
const sub = this.parseExpression();
|
|
735
|
+
if (sub === null) {
|
|
736
|
+
throw new Error("Expected expression");
|
|
721
737
|
}
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
const sub = this.parseExpression();
|
|
725
|
-
if (sub === null) {
|
|
726
|
-
throw new Error("Expected expression");
|
|
727
|
-
}
|
|
728
|
-
if (!this.token.isRightParenthesis()) {
|
|
729
|
-
throw new Error("Expected right parenthesis");
|
|
730
|
-
}
|
|
731
|
-
this.setNextToken();
|
|
732
|
-
const lookup = this.parseLookup(sub);
|
|
733
|
-
expression.addNode(lookup);
|
|
738
|
+
if (!this.token.isRightParenthesis()) {
|
|
739
|
+
throw new Error("Expected right parenthesis");
|
|
734
740
|
}
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
741
|
-
|
|
741
|
+
this.setNextToken();
|
|
742
|
+
const lookup = this.parseLookup(sub);
|
|
743
|
+
expression.addNode(lookup);
|
|
744
|
+
return true;
|
|
745
|
+
}
|
|
746
|
+
else if (this.token.isOpeningBrace() || this.token.isOpeningBracket()) {
|
|
747
|
+
const json = this.parseJSON();
|
|
748
|
+
if (json === null) {
|
|
749
|
+
throw new Error("Expected JSON object");
|
|
742
750
|
}
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
751
|
+
const lookup = this.parseLookup(json);
|
|
752
|
+
expression.addNode(lookup);
|
|
753
|
+
return true;
|
|
754
|
+
}
|
|
755
|
+
else if (this.token.isCase()) {
|
|
756
|
+
const _case = this.parseCase();
|
|
757
|
+
if (_case === null) {
|
|
758
|
+
throw new Error("Expected CASE statement");
|
|
749
759
|
}
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
760
|
+
expression.addNode(_case);
|
|
761
|
+
return true;
|
|
762
|
+
}
|
|
763
|
+
else if (this.token.isNot()) {
|
|
764
|
+
const not = new operator_1.Not();
|
|
765
|
+
this.setNextToken();
|
|
766
|
+
// NOT should only bind to the next operand, not the entire expression
|
|
767
|
+
const tempExpr = new expression_1.default();
|
|
768
|
+
if (!this.parseOperand(tempExpr)) {
|
|
769
|
+
throw new Error("Expected expression after NOT");
|
|
759
770
|
}
|
|
760
|
-
|
|
771
|
+
tempExpr.finish();
|
|
772
|
+
not.addChild(tempExpr);
|
|
773
|
+
expression.addNode(not);
|
|
774
|
+
return true;
|
|
775
|
+
}
|
|
776
|
+
return false;
|
|
777
|
+
}
|
|
778
|
+
parseExpression() {
|
|
779
|
+
const expression = new expression_1.default();
|
|
780
|
+
while (true) {
|
|
781
|
+
if (!this.parseOperand(expression)) {
|
|
761
782
|
if (expression.nodesAdded()) {
|
|
762
783
|
throw new Error("Expected operand or left parenthesis");
|
|
763
784
|
}
|