flowquery 1.0.18 → 1.0.21

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.
Files changed (158) hide show
  1. package/.gitattributes +3 -0
  2. package/.github/workflows/python-publish.yml +56 -4
  3. package/.github/workflows/release.yml +26 -19
  4. package/.husky/pre-commit +26 -0
  5. package/README.md +37 -32
  6. package/dist/flowquery.min.js +1 -1
  7. package/dist/graph/data.d.ts +5 -4
  8. package/dist/graph/data.d.ts.map +1 -1
  9. package/dist/graph/data.js +38 -20
  10. package/dist/graph/data.js.map +1 -1
  11. package/dist/graph/node.d.ts +2 -0
  12. package/dist/graph/node.d.ts.map +1 -1
  13. package/dist/graph/node.js +23 -0
  14. package/dist/graph/node.js.map +1 -1
  15. package/dist/graph/node_data.js +1 -1
  16. package/dist/graph/node_data.js.map +1 -1
  17. package/dist/graph/pattern.d.ts.map +1 -1
  18. package/dist/graph/pattern.js +11 -4
  19. package/dist/graph/pattern.js.map +1 -1
  20. package/dist/graph/relationship.d.ts +6 -1
  21. package/dist/graph/relationship.d.ts.map +1 -1
  22. package/dist/graph/relationship.js +43 -5
  23. package/dist/graph/relationship.js.map +1 -1
  24. package/dist/graph/relationship_data.d.ts +2 -0
  25. package/dist/graph/relationship_data.d.ts.map +1 -1
  26. package/dist/graph/relationship_data.js +8 -1
  27. package/dist/graph/relationship_data.js.map +1 -1
  28. package/dist/graph/relationship_match_collector.js +2 -2
  29. package/dist/graph/relationship_match_collector.js.map +1 -1
  30. package/dist/graph/relationship_reference.d.ts.map +1 -1
  31. package/dist/graph/relationship_reference.js +2 -1
  32. package/dist/graph/relationship_reference.js.map +1 -1
  33. package/dist/index.d.ts +1 -1
  34. package/dist/index.js +1 -1
  35. package/dist/parsing/parser.d.ts +6 -0
  36. package/dist/parsing/parser.d.ts.map +1 -1
  37. package/dist/parsing/parser.js +139 -72
  38. package/dist/parsing/parser.js.map +1 -1
  39. package/docs/flowquery.min.js +1 -1
  40. package/flowquery-py/misc/data/test.json +10 -0
  41. package/flowquery-py/misc/data/users.json +242 -0
  42. package/flowquery-py/notebooks/TestFlowQuery.ipynb +440 -0
  43. package/flowquery-py/pyproject.toml +48 -2
  44. package/flowquery-py/src/__init__.py +7 -5
  45. package/flowquery-py/src/compute/runner.py +14 -10
  46. package/flowquery-py/src/extensibility.py +8 -8
  47. package/flowquery-py/src/graph/__init__.py +7 -7
  48. package/flowquery-py/src/graph/data.py +38 -20
  49. package/flowquery-py/src/graph/database.py +10 -20
  50. package/flowquery-py/src/graph/node.py +50 -19
  51. package/flowquery-py/src/graph/node_data.py +1 -1
  52. package/flowquery-py/src/graph/node_reference.py +10 -11
  53. package/flowquery-py/src/graph/pattern.py +27 -37
  54. package/flowquery-py/src/graph/pattern_expression.py +13 -11
  55. package/flowquery-py/src/graph/patterns.py +2 -2
  56. package/flowquery-py/src/graph/physical_node.py +4 -3
  57. package/flowquery-py/src/graph/physical_relationship.py +5 -5
  58. package/flowquery-py/src/graph/relationship.py +62 -14
  59. package/flowquery-py/src/graph/relationship_data.py +7 -2
  60. package/flowquery-py/src/graph/relationship_match_collector.py +15 -10
  61. package/flowquery-py/src/graph/relationship_reference.py +4 -4
  62. package/flowquery-py/src/io/command_line.py +13 -14
  63. package/flowquery-py/src/parsing/__init__.py +2 -2
  64. package/flowquery-py/src/parsing/alias_option.py +1 -1
  65. package/flowquery-py/src/parsing/ast_node.py +21 -20
  66. package/flowquery-py/src/parsing/base_parser.py +7 -7
  67. package/flowquery-py/src/parsing/components/__init__.py +3 -3
  68. package/flowquery-py/src/parsing/components/from_.py +3 -1
  69. package/flowquery-py/src/parsing/components/headers.py +2 -2
  70. package/flowquery-py/src/parsing/components/null.py +2 -2
  71. package/flowquery-py/src/parsing/context.py +7 -7
  72. package/flowquery-py/src/parsing/data_structures/associative_array.py +7 -7
  73. package/flowquery-py/src/parsing/data_structures/json_array.py +3 -3
  74. package/flowquery-py/src/parsing/data_structures/key_value_pair.py +4 -4
  75. package/flowquery-py/src/parsing/data_structures/lookup.py +2 -2
  76. package/flowquery-py/src/parsing/data_structures/range_lookup.py +2 -2
  77. package/flowquery-py/src/parsing/expressions/__init__.py +16 -16
  78. package/flowquery-py/src/parsing/expressions/expression.py +16 -13
  79. package/flowquery-py/src/parsing/expressions/expression_map.py +9 -9
  80. package/flowquery-py/src/parsing/expressions/f_string.py +3 -3
  81. package/flowquery-py/src/parsing/expressions/identifier.py +4 -3
  82. package/flowquery-py/src/parsing/expressions/number.py +3 -3
  83. package/flowquery-py/src/parsing/expressions/operator.py +16 -16
  84. package/flowquery-py/src/parsing/expressions/reference.py +3 -3
  85. package/flowquery-py/src/parsing/expressions/string.py +2 -2
  86. package/flowquery-py/src/parsing/functions/__init__.py +17 -17
  87. package/flowquery-py/src/parsing/functions/aggregate_function.py +8 -8
  88. package/flowquery-py/src/parsing/functions/async_function.py +12 -9
  89. package/flowquery-py/src/parsing/functions/avg.py +4 -4
  90. package/flowquery-py/src/parsing/functions/collect.py +6 -6
  91. package/flowquery-py/src/parsing/functions/function.py +6 -6
  92. package/flowquery-py/src/parsing/functions/function_factory.py +31 -34
  93. package/flowquery-py/src/parsing/functions/function_metadata.py +10 -11
  94. package/flowquery-py/src/parsing/functions/functions.py +14 -6
  95. package/flowquery-py/src/parsing/functions/join.py +3 -3
  96. package/flowquery-py/src/parsing/functions/keys.py +3 -3
  97. package/flowquery-py/src/parsing/functions/predicate_function.py +8 -7
  98. package/flowquery-py/src/parsing/functions/predicate_sum.py +12 -7
  99. package/flowquery-py/src/parsing/functions/rand.py +2 -2
  100. package/flowquery-py/src/parsing/functions/range_.py +9 -4
  101. package/flowquery-py/src/parsing/functions/replace.py +2 -2
  102. package/flowquery-py/src/parsing/functions/round_.py +2 -2
  103. package/flowquery-py/src/parsing/functions/size.py +2 -2
  104. package/flowquery-py/src/parsing/functions/split.py +9 -4
  105. package/flowquery-py/src/parsing/functions/stringify.py +3 -3
  106. package/flowquery-py/src/parsing/functions/sum.py +4 -4
  107. package/flowquery-py/src/parsing/functions/to_json.py +2 -2
  108. package/flowquery-py/src/parsing/functions/type_.py +3 -3
  109. package/flowquery-py/src/parsing/functions/value_holder.py +1 -1
  110. package/flowquery-py/src/parsing/logic/__init__.py +2 -2
  111. package/flowquery-py/src/parsing/logic/case.py +0 -1
  112. package/flowquery-py/src/parsing/logic/when.py +3 -1
  113. package/flowquery-py/src/parsing/operations/__init__.py +10 -10
  114. package/flowquery-py/src/parsing/operations/aggregated_return.py +3 -5
  115. package/flowquery-py/src/parsing/operations/aggregated_with.py +4 -4
  116. package/flowquery-py/src/parsing/operations/call.py +6 -7
  117. package/flowquery-py/src/parsing/operations/create_node.py +5 -4
  118. package/flowquery-py/src/parsing/operations/create_relationship.py +5 -4
  119. package/flowquery-py/src/parsing/operations/group_by.py +18 -16
  120. package/flowquery-py/src/parsing/operations/load.py +21 -19
  121. package/flowquery-py/src/parsing/operations/match.py +8 -7
  122. package/flowquery-py/src/parsing/operations/operation.py +3 -3
  123. package/flowquery-py/src/parsing/operations/projection.py +6 -6
  124. package/flowquery-py/src/parsing/operations/return_op.py +9 -5
  125. package/flowquery-py/src/parsing/operations/unwind.py +3 -2
  126. package/flowquery-py/src/parsing/operations/where.py +9 -7
  127. package/flowquery-py/src/parsing/operations/with_op.py +2 -2
  128. package/flowquery-py/src/parsing/parser.py +178 -114
  129. package/flowquery-py/src/parsing/token_to_node.py +2 -2
  130. package/flowquery-py/src/tokenization/__init__.py +4 -4
  131. package/flowquery-py/src/tokenization/keyword.py +1 -1
  132. package/flowquery-py/src/tokenization/operator.py +1 -1
  133. package/flowquery-py/src/tokenization/string_walker.py +4 -4
  134. package/flowquery-py/src/tokenization/symbol.py +1 -1
  135. package/flowquery-py/src/tokenization/token.py +11 -11
  136. package/flowquery-py/src/tokenization/token_mapper.py +10 -9
  137. package/flowquery-py/src/tokenization/token_type.py +1 -1
  138. package/flowquery-py/src/tokenization/tokenizer.py +19 -19
  139. package/flowquery-py/src/tokenization/trie.py +18 -17
  140. package/flowquery-py/src/utils/__init__.py +1 -1
  141. package/flowquery-py/src/utils/object_utils.py +3 -3
  142. package/flowquery-py/src/utils/string_utils.py +12 -12
  143. package/flowquery-py/tests/compute/test_runner.py +214 -7
  144. package/flowquery-py/tests/parsing/test_parser.py +41 -0
  145. package/flowquery-vscode/flowQueryEngine/flowquery.min.js +1 -1
  146. package/package.json +1 -1
  147. package/src/graph/data.ts +38 -20
  148. package/src/graph/node.ts +23 -0
  149. package/src/graph/node_data.ts +1 -1
  150. package/src/graph/pattern.ts +13 -4
  151. package/src/graph/relationship.ts +45 -5
  152. package/src/graph/relationship_data.ts +8 -1
  153. package/src/graph/relationship_match_collector.ts +1 -1
  154. package/src/graph/relationship_reference.ts +2 -1
  155. package/src/index.ts +5 -5
  156. package/src/parsing/parser.ts +139 -71
  157. package/tests/compute/runner.test.ts +249 -79
  158. package/tests/parsing/parser.test.ts +32 -0
@@ -9,10 +9,11 @@ declare class IndexEntry {
9
9
  clone(): IndexEntry;
10
10
  }
11
11
  declare class Layer {
12
- private _index;
12
+ private _indexes;
13
13
  private _current;
14
- constructor(index: Map<string, IndexEntry>);
15
- get index(): Map<string, IndexEntry>;
14
+ constructor(indexes: Map<string, Map<string, IndexEntry>>);
15
+ index(name: string): Map<string, IndexEntry>;
16
+ get indexes(): Map<string, Map<string, IndexEntry>>;
16
17
  get current(): number;
17
18
  set current(value: number);
18
19
  }
@@ -22,7 +23,7 @@ declare class Data {
22
23
  constructor(records?: Record<string, any>[]);
23
24
  protected _buildIndex(key: string, level?: number): void;
24
25
  layer(level?: number): Layer;
25
- protected _find(key: string, level?: number): boolean;
26
+ protected _find(key: string, level?: number, indexName?: string): boolean;
26
27
  reset(): void;
27
28
  next(level?: number): boolean;
28
29
  current(level?: number): Record<string, any> | null;
@@ -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;IAMb,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"}
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,QAAQ,CAAmD;IACnE,OAAO,CAAC,QAAQ,CAAc;gBAClB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAGlD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAMnD,IAAW,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAEzD;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;IAYpD,KAAK,CAAC,KAAK,GAAE,MAAU,GAAG,KAAK;IAetC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAkBrE,KAAK,IAAI,IAAI;IAUb,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"}
@@ -26,13 +26,19 @@ class IndexEntry {
26
26
  }
27
27
  }
28
28
  class Layer {
29
- constructor(index) {
30
- this._index = new Map();
29
+ constructor(indexes) {
30
+ this._indexes = new Map();
31
31
  this._current = -1;
32
- this._index = index;
32
+ this._indexes = indexes;
33
33
  }
34
- get index() {
35
- return this._index;
34
+ index(name) {
35
+ if (!this._indexes.has(name)) {
36
+ this._indexes.set(name, new Map());
37
+ }
38
+ return this._indexes.get(name);
39
+ }
40
+ get indexes() {
41
+ return this._indexes;
36
42
  }
37
43
  get current() {
38
44
  return this._current;
@@ -49,34 +55,42 @@ class Data {
49
55
  this._layers.set(0, new Layer(new Map()));
50
56
  }
51
57
  _buildIndex(key, level = 0) {
52
- this.layer(level).index.clear();
53
- this._records.forEach((record, idx) => {
58
+ const idx = this.layer(level).index(key);
59
+ idx.clear();
60
+ this._records.forEach((record, i) => {
54
61
  if (record.hasOwnProperty(key)) {
55
- if (!this.layer(level).index.has(record[key])) {
56
- this.layer(level).index.set(record[key], new IndexEntry());
62
+ if (!idx.has(record[key])) {
63
+ idx.set(record[key], new IndexEntry());
57
64
  }
58
- this.layer(level).index.get(record[key]).add(idx);
65
+ idx.get(record[key]).add(i);
59
66
  }
60
67
  });
61
68
  }
62
69
  layer(level = 0) {
63
70
  if (!this._layers.has(level)) {
64
71
  const first = this._layers.get(0);
65
- const cloned = new Map();
66
- for (const [key, entry] of first.index) {
67
- cloned.set(key, entry.clone());
72
+ const clonedIndexes = new Map();
73
+ for (const [name, indexMap] of first.indexes) {
74
+ const clonedMap = new Map();
75
+ for (const [key, entry] of indexMap) {
76
+ clonedMap.set(key, entry.clone());
77
+ }
78
+ clonedIndexes.set(name, clonedMap);
68
79
  }
69
- this._layers.set(level, new Layer(cloned));
80
+ this._layers.set(level, new Layer(clonedIndexes));
70
81
  }
71
82
  return this._layers.get(level);
72
83
  }
73
- _find(key, level = 0) {
74
- if (!this.layer(level).index.has(key)) {
84
+ _find(key, level = 0, indexName) {
85
+ const idx = indexName
86
+ ? this.layer(level).index(indexName)
87
+ : this.layer(level).indexes.values().next().value;
88
+ if (!idx || !idx.has(key)) {
75
89
  this.layer(level).current = this._records.length; // Move to end
76
90
  return false;
77
91
  }
78
92
  else {
79
- const entry = this.layer(level).index.get(key);
93
+ const entry = idx.get(key);
80
94
  const more = entry.next();
81
95
  if (!more) {
82
96
  this.layer(level).current = this._records.length; // Move to end
@@ -87,9 +101,13 @@ class Data {
87
101
  }
88
102
  }
89
103
  reset() {
90
- this.layer(0).current = -1;
91
- for (const entry of this.layer(0).index.values()) {
92
- entry.reset();
104
+ for (const layer of this._layers.values()) {
105
+ layer.current = -1;
106
+ for (const indexMap of layer.indexes.values()) {
107
+ for (const entry of indexMap.values()) {
108
+ entry.reset();
109
+ }
110
+ }
93
111
  }
94
112
  }
95
113
  next(level = 0) {
@@ -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":"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"}
@@ -17,6 +17,8 @@ declare class Node extends ASTNode {
17
17
  set label(label: string);
18
18
  get label(): string | null;
19
19
  get properties(): Map<string, Expression>;
20
+ set properties(properties: Map<string, Expression>);
21
+ private _matchesProperties;
20
22
  setProperty(key: string, value: Expression): void;
21
23
  getProperty(key: string): Expression | null;
22
24
  setValue(value: NodeRecord): void;
@@ -1 +1 @@
1
- {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/graph/node.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,cAAM,IAAK,SAAQ,OAAO;IACtB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC3D,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAQ;IAE3C,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAQ;IAChD,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAQ;IAEhD,OAAO,CAAC,KAAK,CAAyB;IAOtC,OAAO,CAAC,SAAS,CAAsC;gBAE3C,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW;IAKzE,IAAW,UAAU,CAAC,UAAU,EAAE,MAAM,EAEvC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACD,IAAW,KAAK,CAAC,KAAK,EAAE,MAAM,EAE7B;IACD,IAAW,KAAK,IAAI,MAAM,GAAG,IAAI,CAEhC;IACD,IAAW,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAE/C;IACM,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAG3C,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjC,KAAK,IAAI,UAAU,GAAG,IAAI;IAGjC,IAAW,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,EAEpD;IACD,IAAW,QAAQ,IAAI,YAAY,GAAG,IAAI,CAEzC;IACD,IAAW,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,EAEpD;IACD,IAAW,QAAQ,IAAI,YAAY,GAAG,IAAI,CAEzC;IACM,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;IAG9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,IAAW,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAErD;IACY,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5C;AAED,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/graph/node.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,cAAM,IAAK,SAAQ,OAAO;IACtB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC3D,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAQ;IAE3C,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAQ;IAChD,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAQ;IAEhD,OAAO,CAAC,KAAK,CAAyB;IAOtC,OAAO,CAAC,SAAS,CAAsC;gBAE3C,UAAU,GAAE,MAAM,GAAG,IAAW,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW;IAKzE,IAAW,UAAU,CAAC,UAAU,EAAE,MAAM,EAEvC;IACD,IAAW,UAAU,IAAI,MAAM,GAAG,IAAI,CAErC;IACD,IAAW,KAAK,CAAC,KAAK,EAAE,MAAM,EAE7B;IACD,IAAW,KAAK,IAAI,MAAM,GAAG,IAAI,CAEhC;IACD,IAAW,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAE/C;IACD,IAAW,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAExD;IACD,OAAO,CAAC,kBAAkB;IAcnB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAG3C,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAGjC,KAAK,IAAI,UAAU,GAAG,IAAI;IAGjC,IAAW,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,EAEpD;IACD,IAAW,QAAQ,IAAI,YAAY,GAAG,IAAI,CAEzC;IACD,IAAW,QAAQ,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,EAEpD;IACD,IAAW,QAAQ,IAAI,YAAY,GAAG,IAAI,CAEzC;IACM,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;IAG9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D,IAAW,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAErD;IACY,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5C;AAED,eAAe,IAAI,CAAC"}
@@ -47,6 +47,23 @@ class Node extends ast_node_1.default {
47
47
  get properties() {
48
48
  return this._properties;
49
49
  }
50
+ set properties(properties) {
51
+ this._properties = properties;
52
+ }
53
+ _matchesProperties(hop = 0) {
54
+ const data = this._data;
55
+ for (const [key, expression] of this._properties) {
56
+ const record = data.current(hop);
57
+ if (record === null) {
58
+ throw new Error("No current node data available");
59
+ }
60
+ if (!(key in record)) {
61
+ throw new Error("Node does not have property");
62
+ }
63
+ return record[key] === expression.value();
64
+ }
65
+ return true;
66
+ }
50
67
  setProperty(key, value) {
51
68
  this._properties.set(key, value);
52
69
  }
@@ -80,6 +97,9 @@ class Node extends ast_node_1.default {
80
97
  (_a = this._data) === null || _a === void 0 ? void 0 : _a.reset();
81
98
  while ((_b = this._data) === null || _b === void 0 ? void 0 : _b.next()) {
82
99
  this.setValue((_c = this._data) === null || _c === void 0 ? void 0 : _c.current());
100
+ if (!this._matchesProperties()) {
101
+ continue;
102
+ }
83
103
  yield ((_d = this._outgoing) === null || _d === void 0 ? void 0 : _d.find(this._value.id));
84
104
  yield this.runTodoNext();
85
105
  }
@@ -91,6 +111,9 @@ class Node extends ast_node_1.default {
91
111
  (_a = this._data) === null || _a === void 0 ? void 0 : _a.reset();
92
112
  while ((_b = this._data) === null || _b === void 0 ? void 0 : _b.find(id, hop)) {
93
113
  this.setValue((_c = this._data) === null || _c === void 0 ? void 0 : _c.current(hop));
114
+ if (!this._matchesProperties(hop)) {
115
+ continue;
116
+ }
94
117
  (_d = this._incoming) === null || _d === void 0 ? void 0 : _d.setEndNode(this);
95
118
  yield ((_e = this._outgoing) === null || _e === void 0 ? void 0 : _e.find(this._value.id, hop));
96
119
  yield this.runTodoNext();
@@ -1 +1 @@
1
- {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/graph/node.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/graph/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,mEAA0C;AAK1C,MAAM,IAAK,SAAQ,kBAAO;IAkBtB,YAAY,aAA4B,IAAI,EAAE,QAAuB,IAAI;QACrE,KAAK,EAAE,CAAC;QAlBF,gBAAW,GAAkB,IAAI,CAAC;QAClC,WAAM,GAAkB,IAAI,CAAC;QAC7B,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;QACjD,WAAM,GAAsB,IAAI,CAAC;QAEjC,cAAS,GAAwB,IAAI,CAAC;QACtC,cAAS,GAAwB,IAAI,CAAC;QAExC,UAAK,GAAoB,IAAI,CAAC;QAEtC,+DAA+D;QAC/D,gDAAgD;QAChD,iEAAiE;QACjE,+DAA+D;QAC/D,6CAA6C;QACrC,cAAS,GAAiC,IAAI,CAAC;QAInD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,IAAW,UAAU,CAAC,UAAkB;QACpC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IACD,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAW,KAAK,CAAC,KAAa;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAW,UAAU,CAAC,UAAmC;QACrD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IACO,kBAAkB,CAAC,MAAc,CAAC;QACtC,MAAM,IAAI,GAAa,IAAI,CAAC,KAAM,CAAC;QACnC,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAe,IAAI,CAAC,OAAO,CAAC,GAAG,CAAE,CAAC;YAC9C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,WAAW,CAAC,GAAW,EAAE,KAAiB;QAC7C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;IACM,WAAW,CAAC,GAAW;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IAC7C,CAAC;IACM,QAAQ,CAAC,KAAiB;QAC7B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACM,KAAK;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAW,QAAQ,CAAC,YAAiC;QACjD,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;IAClC,CAAC;IACD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAW,QAAQ,CAAC,YAAiC;QACjD,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;IAClC,CAAC;IACD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,OAAO,CAAC,IAAqB;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IACY,IAAI;;;YACb,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,EAAE,CAAC;YACpB,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,EAAE,EAAE,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,EAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;oBAC7B,SAAS;gBACb,CAAC;gBACD,MAAM,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,CAAA,CAAC;gBAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC;KAAA;IACY,IAAI;6DAAC,EAAU,EAAE,MAAc,CAAC;;YACzC,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,EAAE,CAAC;YACpB,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,GAAG,CAAe,CAAC,CAAC;gBACtD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,SAAS;gBACb,CAAC;gBACD,MAAA,IAAI,CAAC,SAAS,0CAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,IAAI,CAAC,MAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA,CAAC;gBACjD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC;KAAA;IACD,6EAA6E;IAC7E,IAAW,QAAQ,CAAC,IAAkC;QAClD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC;IACY,WAAW;;YACpB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,CAAC;QACL,CAAC;KAAA;CACJ;AAED,kBAAe,IAAI,CAAC"}
@@ -10,7 +10,7 @@ class NodeData extends data_1.default {
10
10
  super._buildIndex("id");
11
11
  }
12
12
  find(id, hop = 0) {
13
- return super._find(id, hop);
13
+ return super._find(id, hop, "id");
14
14
  }
15
15
  current(hop = 0) {
16
16
  return super.current(hop);
@@ -1 +1 @@
1
- {"version":3,"file":"node_data.js","sourceRoot":"","sources":["../../src/graph/node_data.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAI1B,MAAM,QAAS,SAAQ,cAAI;IACvB,YAAY,UAAwB,EAAE;QAClC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACM,IAAI,CAAC,EAAU,EAAE,MAAc,CAAC;QACnC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IACM,OAAO,CAAC,MAAc,CAAC;QAC1B,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAsB,CAAC;IACnD,CAAC;CACJ;AAED,kBAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"node_data.js","sourceRoot":"","sources":["../../src/graph/node_data.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAI1B,MAAM,QAAS,SAAQ,cAAI;IACvB,YAAY,UAAwB,EAAE;QAClC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACM,IAAI,CAAC,EAAU,EAAE,MAAc,CAAC;QACnC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IACM,OAAO,CAAC,MAAc,CAAC;QAC1B,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAsB,CAAC;IACnD,CAAC;CACJ;AAED,kBAAe,QAAQ,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;IAgBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAiB1C;AACD,eAAe,OAAO,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"}
@@ -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 (const element of this._chain) {
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 i = 0;
90
+ let j = 0;
84
91
  for (const match of element.matches) {
85
92
  yield match;
86
- if (i < element.matches.length - 1) {
93
+ if (j < element.matches.length - 1) {
87
94
  yield match.endNode;
88
95
  }
89
- i++;
96
+ j++;
90
97
  }
91
98
  }
92
99
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/graph/pattern.ts"],"names":[],"mappings":"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"}
@@ -13,13 +13,16 @@ declare class Relationship extends ASTNode {
13
13
  protected _matches: RelationshipMatchCollector;
14
14
  protected _source: Node | null;
15
15
  protected _target: Node | null;
16
+ protected _direction: "left" | "right";
16
17
  private _data;
17
18
  constructor(identifier?: string | null, type?: string | null);
18
19
  set identifier(identifier: string);
19
20
  get identifier(): string | null;
20
21
  set type(type: string);
21
22
  get type(): string | null;
22
- get properties(): Record<string, any>;
23
+ get properties(): Map<string, Expression>;
24
+ set properties(properties: Map<string, Expression>);
25
+ private _matchesProperties;
23
26
  setProperty(key: string, value: Expression): void;
24
27
  getProperty(key: string): Expression | null;
25
28
  set hops(hops: Hops);
@@ -29,6 +32,8 @@ declare class Relationship extends ASTNode {
29
32
  get source(): Node | null;
30
33
  set target(node: Node | null);
31
34
  get target(): Node | null;
35
+ set direction(direction: "left" | "right");
36
+ get direction(): "left" | "right";
32
37
  value(): RelationshipMatchRecord | RelationshipMatchRecord[] | null;
33
38
  get matches(): RelationshipMatchRecord[];
34
39
  setData(data: RelationshipData | null): void;
@@ -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;CA2BrE;AAED,eAAe,YAAY,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;IACtC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAW;IAEjD,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,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAE/C;IACD,IAAW,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAExD;IACD,OAAO,CAAC,kBAAkB;IAcnB,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;IACD,IAAW,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,EAE/C;IACD,IAAW,SAAS,IAAI,MAAM,GAAG,OAAO,CAEvC;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;CA2CrE;AAED,eAAe,YAAY,CAAC"}
@@ -26,6 +26,7 @@ class Relationship extends ast_node_1.default {
26
26
  this._matches = new relationship_match_collector_1.default();
27
27
  this._source = null;
28
28
  this._target = null;
29
+ this._direction = "right";
29
30
  this._data = null;
30
31
  this._identifier = identifier;
31
32
  this._type = type;
@@ -43,8 +44,24 @@ class Relationship extends ast_node_1.default {
43
44
  return this._type;
44
45
  }
45
46
  get properties() {
46
- var _a;
47
- return ((_a = this._data) === null || _a === void 0 ? void 0 : _a.properties()) || {};
47
+ return this._properties;
48
+ }
49
+ set properties(properties) {
50
+ this._properties = properties;
51
+ }
52
+ _matchesProperties(hop = 0) {
53
+ const data = this._data;
54
+ for (const [key, expression] of this._properties) {
55
+ const record = data.current(hop);
56
+ if (record === null) {
57
+ throw new Error("No current relationship data available");
58
+ }
59
+ if (!(key in record)) {
60
+ throw new Error("Relationship does not have property");
61
+ }
62
+ return record[key] === expression.value();
63
+ }
64
+ return true;
48
65
  }
49
66
  setProperty(key, value) {
50
67
  this._properties.set(key, value);
@@ -74,6 +91,12 @@ class Relationship extends ast_node_1.default {
74
91
  get target() {
75
92
  return this._target;
76
93
  }
94
+ set direction(direction) {
95
+ this._direction = direction;
96
+ }
97
+ get direction() {
98
+ return this._direction;
99
+ }
77
100
  value() {
78
101
  return this._value;
79
102
  }
@@ -94,23 +117,38 @@ class Relationship extends ast_node_1.default {
94
117
  var _a, _b, _c, _d;
95
118
  // Save original source node
96
119
  const original = this._source;
120
+ const isLeft = this._direction === "left";
97
121
  if (hop > 0) {
98
122
  // For hops greater than 0, the source becomes the target of the previous hop
99
123
  this._source = this._target;
100
124
  }
101
125
  if (hop === 0) {
102
126
  (_a = this._data) === null || _a === void 0 ? void 0 : _a.reset();
127
+ // Handle zero-hop case: when min is 0 on a variable-length relationship,
128
+ // match source node as target (no traversal)
129
+ if (((_b = this.hops) === null || _b === void 0 ? void 0 : _b.multi()) && this.hops.min === 0 && this._target) {
130
+ // For zero-hop, target finds the same node as source (left_id)
131
+ // No relationship match is pushed since no edge is traversed
132
+ yield this._target.find(left_id, hop);
133
+ }
103
134
  }
104
- while ((_b = this._data) === null || _b === void 0 ? void 0 : _b.find(left_id, hop)) {
135
+ const findMatch = isLeft
136
+ ? (id, h) => this._data.findReverse(id, h)
137
+ : (id, h) => this._data.find(id, h);
138
+ const followId = isLeft ? "left_id" : "right_id";
139
+ while (findMatch(left_id, hop)) {
105
140
  const data = (_c = this._data) === null || _c === void 0 ? void 0 : _c.current(hop);
106
141
  if (hop >= this.hops.min) {
107
142
  this.setValue(this);
108
- yield ((_d = this._target) === null || _d === void 0 ? void 0 : _d.find(data.right_id, hop));
143
+ if (!this._matchesProperties(hop)) {
144
+ continue;
145
+ }
146
+ yield ((_d = this._target) === null || _d === void 0 ? void 0 : _d.find(data[followId], hop));
109
147
  if (this._matches.isCircular()) {
110
148
  throw new Error("Circular relationship detected");
111
149
  }
112
150
  if (hop + 1 < this.hops.max) {
113
- yield this.find(data.right_id, hop + 1);
151
+ yield this.find(data[followId], hop + 1);
114
152
  }
115
153
  this._matches.pop();
116
154
  }
@@ -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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"}
@@ -6,7 +6,9 @@ export type RelationshipRecord = {
6
6
  declare class RelationshipData extends Data {
7
7
  constructor(records?: RelationshipRecord[]);
8
8
  find(left_id: string, hop?: number): boolean;
9
+ findReverse(right_id: string, hop?: number): boolean;
9
10
  properties(): Record<string, any> | null;
11
+ current(hop?: number): RelationshipRecord | null;
10
12
  }
11
13
  export default RelationshipData;
12
14
  //# sourceMappingURL=relationship_data.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"relationship_data.d.ts","sourceRoot":"","sources":["../../src/graph/relationship_data.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,MAAM,MAAM,kBAAkB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE7F,cAAM,gBAAiB,SAAQ,IAAI;gBACnB,OAAO,GAAE,kBAAkB,EAAO;IAIvC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO;IAO/C,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;CAQlD;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"relationship_data.d.ts","sourceRoot":"","sources":["../../src/graph/relationship_data.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,MAAM,MAAM,kBAAkB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE7F,cAAM,gBAAiB,SAAQ,IAAI;gBACnB,OAAO,GAAE,kBAAkB,EAAO;IAKvC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO;IAG/C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO;IAOvD,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAQxC,OAAO,CAAC,GAAG,GAAE,MAAU,GAAG,kBAAkB,GAAG,IAAI;CAG7D;AAED,eAAe,gBAAgB,CAAC"}
@@ -19,9 +19,13 @@ class RelationshipData extends data_1.default {
19
19
  constructor(records = []) {
20
20
  super(records);
21
21
  super._buildIndex("left_id");
22
+ super._buildIndex("right_id");
22
23
  }
23
24
  find(left_id, hop = 0) {
24
- return super._find(left_id, hop);
25
+ return super._find(left_id, hop, "left_id");
26
+ }
27
+ findReverse(right_id, hop = 0) {
28
+ return super._find(right_id, hop, "right_id");
25
29
  }
26
30
  /*
27
31
  ** Get the properties of the current relationship record
@@ -35,6 +39,9 @@ class RelationshipData extends data_1.default {
35
39
  }
36
40
  return null;
37
41
  }
42
+ current(hop = 0) {
43
+ return super.current(hop);
44
+ }
38
45
  }
39
46
  exports.default = RelationshipData;
40
47
  //# sourceMappingURL=relationship_data.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"relationship_data.js","sourceRoot":"","sources":["../../src/graph/relationship_data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA0B;AAI1B,MAAM,gBAAiB,SAAQ,cAAI;IAC/B,YAAY,UAAgC,EAAE;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IACM,IAAI,CAAC,OAAe,EAAE,MAAc,CAAC;QACxC,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IACD;;;MAGE;IACK,UAAU;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,OAAO,EAAE,QAAQ,KAAe,OAAO,EAAjB,KAAK,UAAK,OAAO,EAAzC,uBAA+B,CAAU,CAAC;YAChD,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED,kBAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"relationship_data.js","sourceRoot":"","sources":["../../src/graph/relationship_data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA0B;AAI1B,MAAM,gBAAiB,SAAQ,cAAI;IAC/B,YAAY,UAAgC,EAAE;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC7B,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IACM,IAAI,CAAC,OAAe,EAAE,MAAc,CAAC;QACxC,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IACM,WAAW,CAAC,QAAgB,EAAE,MAAc,CAAC;QAChD,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAClD,CAAC;IACD;;;MAGE;IACK,UAAU;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,OAAO,EAAE,QAAQ,KAAe,OAAO,EAAjB,KAAK,UAAK,OAAO,EAAzC,uBAA+B,CAAU,CAAC;YAChD,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,OAAO,CAAC,MAAc,CAAC;QAC1B,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAA8B,CAAC;IAC3D,CAAC;CACJ;AAED,kBAAe,gBAAgB,CAAC"}
@@ -6,12 +6,12 @@ class RelationshipMatchCollector {
6
6
  this._nodeIds = [];
7
7
  }
8
8
  push(relationship) {
9
- var _a;
9
+ var _a, _b;
10
10
  const match = {
11
11
  type: relationship.type,
12
12
  startNode: ((_a = relationship.source) === null || _a === void 0 ? void 0 : _a.value()) || {},
13
13
  endNode: null,
14
- properties: relationship.properties,
14
+ properties: (_b = relationship.getData()) === null || _b === void 0 ? void 0 : _b.properties(),
15
15
  };
16
16
  this._matches.push(match);
17
17
  this._nodeIds.push(match.startNode.id);
@@ -1 +1 @@
1
- {"version":3,"file":"relationship_match_collector.js","sourceRoot":"","sources":["../../src/graph/relationship_match_collector.ts"],"names":[],"mappings":";;AASA,MAAM,0BAA0B;IAAhC;QACY,aAAQ,GAA8B,EAAE,CAAC;QACzC,aAAQ,GAAkB,EAAE,CAAC;IA4CzC,CAAC;IA1CU,IAAI,CAAC,YAA0B;;QAClC,MAAM,KAAK,GAA4B;YACnC,IAAI,EAAE,YAAY,CAAC,IAAK;YACxB,SAAS,EAAE,CAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,KAAK,EAAE,KAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,YAAY,CAAC,UAAU;SACtC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAW,OAAO,CAAC,IAAS;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACnE,CAAC;IACL,CAAC;IACM,GAAG;QACN,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IACM,KAAK;QACR,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD;;;OAGG;IACI,UAAU;QACb,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC5C,CAAC;CACJ;AAED,kBAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"relationship_match_collector.js","sourceRoot":"","sources":["../../src/graph/relationship_match_collector.ts"],"names":[],"mappings":";;AASA,MAAM,0BAA0B;IAAhC;QACY,aAAQ,GAA8B,EAAE,CAAC;QACzC,aAAQ,GAAkB,EAAE,CAAC;IA4CzC,CAAC;IA1CU,IAAI,CAAC,YAA0B;;QAClC,MAAM,KAAK,GAA4B;YACnC,IAAI,EAAE,YAAY,CAAC,IAAK;YACxB,SAAS,EAAE,CAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,KAAK,EAAE,KAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,MAAA,YAAY,CAAC,OAAO,EAAE,0CAAE,UAAU,EAAyB;SAC1E,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAW,OAAO,CAAC,IAAS;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACnE,CAAC;IACL,CAAC;IACM,GAAG;QACN,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IACM,KAAK;QACR,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD;;;OAGG;IACI,UAAU;QACb,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC5C,CAAC;CACJ;AAED,kBAAe,0BAA0B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"relationship_reference.d.ts","sourceRoot":"","sources":["../../src/graph/relationship_reference.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C,cAAM,qBAAsB,SAAQ,YAAY;IAC5C,OAAO,CAAC,UAAU,CAA6B;gBACnC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY;IAS1C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAOrE;AAED,eAAe,qBAAqB,CAAC"}
1
+ {"version":3,"file":"relationship_reference.d.ts","sourceRoot":"","sources":["../../src/graph/relationship_reference.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C,cAAM,qBAAsB,SAAQ,YAAY;IAC5C,OAAO,CAAC,UAAU,CAA6B;gBACnC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY;IAS1C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAQrE;AAED,eAAe,qBAAqB,CAAC"}
@@ -29,7 +29,8 @@ class RelationshipReference extends relationship_1.default {
29
29
  var _a, _b;
30
30
  this.setValue(this._reference);
31
31
  const data = (_a = this._reference.getData()) === null || _a === void 0 ? void 0 : _a.current(hop);
32
- yield ((_b = this._target) === null || _b === void 0 ? void 0 : _b.find(data.right_id, hop));
32
+ const followId = this._direction === "left" ? "left_id" : "right_id";
33
+ yield ((_b = this._target) === null || _b === void 0 ? void 0 : _b.find(data[followId], hop));
33
34
  });
34
35
  }
35
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"relationship_reference.js","sourceRoot":"","sources":["../../src/graph/relationship_reference.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAA0C;AAG1C,MAAM,qBAAsB,SAAQ,sBAAY;IAE5C,YAAY,IAAkB,EAAE,SAAuB;QACnD,KAAK,EAAE,CAAC;QAFJ,eAAU,GAAwB,IAAI,CAAC;QAG3C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAK,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IACY,IAAI;6DAAC,OAAe,EAAE,MAAc,CAAC;;YAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;YAChC,MAAM,IAAI,GAAuB,MAAA,IAAI,CAAC,UAAW,CAAC,OAAO,EAAE,0CAAE,OAAO,CAChE,GAAG,CACgB,CAAC;YACxB,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA,CAAC;QACjD,CAAC;KAAA;CACJ;AAED,kBAAe,qBAAqB,CAAC"}
1
+ {"version":3,"file":"relationship_reference.js","sourceRoot":"","sources":["../../src/graph/relationship_reference.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAA0C;AAG1C,MAAM,qBAAsB,SAAQ,sBAAY;IAE5C,YAAY,IAAkB,EAAE,SAAuB;QACnD,KAAK,EAAE,CAAC;QAFJ,eAAU,GAAwB,IAAI,CAAC;QAG3C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAK,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IACY,IAAI;6DAAC,OAAe,EAAE,MAAc,CAAC;;YAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;YAChC,MAAM,IAAI,GAAuB,MAAA,IAAI,CAAC,UAAW,CAAC,OAAO,EAAE,0CAAE,OAAO,CAChE,GAAG,CACgB,CAAC;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YACrE,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAA,CAAC;QAClD,CAAC;KAAA;CACJ;AAED,kBAAe,qBAAqB,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * FlowQuery - A declarative query language for data processing pipelines.
3
3
  *
4
- * This is the main entry point for the FlowQuery command-line interface.
4
+ * Main entry point for the FlowQuery command-line interface.
5
5
  *
6
6
  * @packageDocumentation
7
7
  */
package/dist/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
  /**
3
3
  * FlowQuery - A declarative query language for data processing pipelines.
4
4
  *
5
- * This is the main entry point for the FlowQuery command-line interface.
5
+ * Main entry point for the FlowQuery command-line interface.
6
6
  *
7
7
  * @packageDocumentation
8
8
  */
@@ -41,6 +41,7 @@ declare class Parser extends BaseParser {
41
41
  private parseCreate;
42
42
  private parseMatch;
43
43
  private parseNode;
44
+ private parseProperties;
44
45
  private parsePatterns;
45
46
  private parsePattern;
46
47
  private parsePatternExpression;
@@ -49,6 +50,11 @@ declare class Parser extends BaseParser {
49
50
  private parseSubQuery;
50
51
  private parseLimit;
51
52
  private parseExpressions;
53
+ /**
54
+ * Parse a single operand (without operators).
55
+ * @returns True if an operand was parsed, false otherwise.
56
+ */
57
+ private parseOperand;
52
58
  private parseExpression;
53
59
  private parseLookup;
54
60
  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;IA8B9B,OAAO,CAAC,iBAAiB;IAyDzB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAE,gBAAgB;IAsCzB,OAAO,CAAC,eAAe;IA4FvB,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"}
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;IA6CjB,OAAO,CAAE,eAAe;IAyCxB,OAAO,CAAE,aAAa;IAgCtB,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,iBAAiB;IA8DzB,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"}