clarity-pattern-parser 3.0.14 → 3.0.16

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 (27) hide show
  1. package/dist/TextSuggester.js +33 -12
  2. package/dist/TextSuggester.js.map +1 -1
  3. package/dist/index.browser.js +8 -3
  4. package/dist/index.browser.js.map +1 -1
  5. package/dist/index.esm.js +8 -3
  6. package/dist/index.esm.js.map +1 -1
  7. package/dist/index.js +8 -3
  8. package/dist/index.js.map +1 -1
  9. package/dist/patterns/Pattern.js +1 -1
  10. package/dist/patterns/Pattern.js.map +1 -1
  11. package/dist/patterns/composite/RepeatComposite.js +6 -1
  12. package/dist/patterns/composite/RepeatComposite.js.map +1 -1
  13. package/dist/patterns/value/RepeatValue.js +6 -1
  14. package/dist/patterns/value/RepeatValue.js.map +1 -1
  15. package/package.json +1 -1
  16. package/src/TextSuggester.ts +2 -1
  17. package/src/patterns/LookAhead.ts +32 -0
  18. package/src/patterns/ReferencePattern.ts +123 -0
  19. package/src/patterns/composite/RepeatComposite.ts +4 -1
  20. package/src/patterns/value/AndValue.ts +0 -1
  21. package/src/patterns/value/RepeatValue.ts +4 -1
  22. package/src/tests/LookAhead.test.ts +93 -0
  23. package/src/tests/NotValue.test.ts +7 -0
  24. package/src/tests/Pattern.test.ts +1 -2
  25. package/src/tests/ReferencePattern.test.ts +24 -0
  26. package/src/tests/TextSuggester.test.ts +15 -0
  27. package/src/tests/javascriptPatterns/json.ts +2 -1
package/dist/patterns/composite/RepeatComposite.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RepeatComposite.js","sourceRoot":"","sources":["../../../src/patterns/composite/RepeatComposite.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RepeatComposite.js","sourceRoot":"","sources":["../../../src/patterns/composite/RepeatComposite.ts"],"names":[],"mappings":"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"}
package/dist/patterns/value/RepeatValue.js CHANGED
@@ -51,6 +51,10 @@ export default class RepeatValue extends ValuePattern {
51
51
  }
52
52
  else {
53
53
  this.nodes.push(node);
54
+ if (node.endIndex === this.cursor.lastIndex()) {
55
+ this._processMatch();
56
+ break;
57
+ }
54
58
  this.cursor.next();
55
59
  }
56
60
  }
@@ -58,8 +62,9 @@ export default class RepeatValue extends ValuePattern {
58
62
  }
59
63
  }
60
64
  _processMatch() {
65
+ const endsOnDivider = this.nodes.length % 2 === 0;
61
66
  this.cursor.resolveError();
62
- if (this.nodes.length === 0) {
67
+ if (endsOnDivider) {
63
68
  const parseError = new ParseError(`Did not find a repeating match of ${this.name}.`, this.mark, this);
64
69
  this.cursor.throwError(parseError);
65
70
  this.node = null;
package/dist/patterns/value/RepeatValue.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RepeatValue.js","sourceRoot":"","sources":["../../../src/patterns/value/RepeatValue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RepeatValue.js","sourceRoot":"","sources":["../../../src/patterns/value/RepeatValue.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "clarity-pattern-parser",
3
- "version": "3.0.14",
3
+ "version": "3.0.16",
4
4
  "description": "Parsing Library for Typescript and Javascript.",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.esm.js",
package/src/TextSuggester.ts CHANGED
@@ -176,8 +176,9 @@ export default class TextSuggester {
176
176
  this.patternMatch?.pattern === this.rootPattern &&
177
177
  this.cursor?.didSuccessfullyParse();
178
178
  const noMatch = this.patternMatch?.astNode == null;
179
+ const noOptions = this.options.length === 0;
179
180
 
180
- if (isCompleteMatch) {
181
+ if (isCompleteMatch && noOptions) {
181
182
  this.tokens = null;
182
183
  return;
183
184
  }
package/src/patterns/LookAhead.ts ADDED
@@ -0,0 +1,32 @@
1
+ import Cursor from "../Cursor";
2
+ import ParseError from "./ParseError";
3
+ import Pattern from "./Pattern";
4
+
5
+ export default class LookAhead extends Pattern {
6
+ constructor(pattern: Pattern) {
7
+ super("look-ahead", "look-ahead", [pattern]);
8
+ }
9
+
10
+ parse(cursor: Cursor) {
11
+ const mark = cursor.mark();
12
+ const node = this.children[0].parse(cursor);
13
+
14
+ if (cursor.hasUnresolvedError() || node == null) {
15
+ cursor.resolveError();
16
+ cursor.throwError(
17
+ new ParseError("Couldn't find look ahead pattern.", mark, this.children[0])
18
+ );
19
+ cursor.moveToMark(mark);
20
+ }
21
+
22
+ return null;
23
+ }
24
+
25
+ clone() {
26
+ return new LookAhead(this.children[0].clone());
27
+ }
28
+
29
+ getTokens() {
30
+ return [];
31
+ }
32
+ }
package/src/patterns/ReferencePattern.ts ADDED
@@ -0,0 +1,123 @@
1
+ import Pattern from "./Pattern";
2
+ import ParserError from "./ParseError";
3
+ import Cursor from "../Cursor";
4
+
5
+ export default class ReferencePattern extends Pattern {
6
+ private isRecursing: boolean;
7
+
8
+ constructor(name: string) {
9
+ super("reference", name);
10
+ this.isRecursing = false;
11
+ }
12
+
13
+ private getRoot() {
14
+ let node = this.parent;
15
+ while (node != null) {
16
+ if (node.parent == null) {
17
+ return node;
18
+ }
19
+ node = node.parent;
20
+ }
21
+ return node;
22
+ }
23
+
24
+ private findPattern(): Pattern | null {
25
+ const root = this.getRoot();
26
+ let result: Pattern | null = null;
27
+
28
+ if (root == null) {
29
+ return null;
30
+ }
31
+
32
+ this.walkTheTree(root, (pattern) => {
33
+ if (
34
+ pattern.name === this.name &&
35
+ pattern != this &&
36
+ pattern.type != "reference"
37
+ ) {
38
+ result = pattern;
39
+ return false;
40
+ }
41
+ return true;
42
+ });
43
+
44
+ return result;
45
+ }
46
+
47
+ private walkTheTree(
48
+ pattern: Pattern,
49
+ callback: (pattern: Pattern) => boolean
50
+ ) {
51
+ for (let x = 0; x < pattern.children.length; x++) {
52
+ const p = pattern.children[x];
53
+ const continueWalking = this.walkTheTree(p, callback);
54
+
55
+ if (!continueWalking) {
56
+ return false;
57
+ }
58
+ }
59
+
60
+ return callback(pattern);
61
+ }
62
+
63
+ parse(cursor: Cursor) {
64
+ try {
65
+ const node = this.safelyGetPattern().parse(cursor);
66
+
67
+ if (!cursor.hasUnresolvedError() && node != null) {
68
+ cursor.addMatch(this, node);
69
+ }
70
+
71
+ return node;
72
+ } catch (error) {
73
+ cursor.throwError(
74
+ new ParserError(
75
+ `Couldn't find reference pattern to parse, with the name ${this.name}.`,
76
+ cursor.index,
77
+ this as Pattern
78
+ )
79
+ );
80
+
81
+ return null;
82
+ }
83
+ }
84
+
85
+ clone(name?: string): Pattern {
86
+ if (typeof name !== "string") {
87
+ name = this.name;
88
+ }
89
+ return new ReferencePattern(name);
90
+ }
91
+
92
+ getTokenValue() {
93
+ return this.safelyGetPattern().getTokenValue();
94
+ }
95
+
96
+ private safelyGetPattern() {
97
+ let pattern = this.children[0];
98
+ const hasNoPattern = pattern == null;
99
+
100
+ if (hasNoPattern) {
101
+ const reference = this.findPattern();
102
+ if (reference == null) {
103
+ throw new Error(
104
+ `Couldn't find reference pattern, with the name ${this.name}.`
105
+ );
106
+ }
107
+
108
+ return reference;
109
+ }
110
+ return pattern;
111
+ }
112
+
113
+ getTokens() {
114
+ if (!this.isRecursing) {
115
+ this.isRecursing = true;
116
+ let pattern = this.safelyGetPattern();
117
+ const tokens = pattern.getTokens();
118
+ this.isRecursing = false;
119
+ return tokens;
120
+ }
121
+ return [];
122
+ }
123
+ }
package/src/patterns/composite/RepeatComposite.ts CHANGED
@@ -88,9 +88,12 @@ export default class RepeatComposite extends CompositePattern {
88
88
 
89
89
  private _processMatch() {
90
90
  const endsOnDivider = this.nodes.length % 2 === 0;
91
+ const noMatch = this.nodes.length === 0;
92
+ const hasDivider = this._divider != null;
93
+
91
94
  this.cursor.resolveError();
92
95
 
93
- if (endsOnDivider) {
96
+ if ((hasDivider && endsOnDivider) || noMatch) {
94
97
  this.cursor.throwError(
95
98
  new ParseError(
96
99
  `Did not find a repeating match of ${this.name}.`,
package/src/patterns/value/AndValue.ts CHANGED
@@ -3,7 +3,6 @@ import ValueNode from "../../ast/ValueNode";
3
3
  import ParseError from "../../patterns/ParseError";
4
4
  import OptionalValue from "./OptionalValue";
5
5
  import Permutor from "../../Permutor";
6
- import Pattern from "../Pattern";
7
6
  import Cursor from "../../Cursor";
8
7
 
9
8
  const permutor = new Permutor();
package/src/patterns/value/RepeatValue.ts CHANGED
@@ -89,9 +89,12 @@ export default class RepeatValue extends ValuePattern {
89
89
 
90
90
  private _processMatch() {
91
91
  const endsOnDivider = this.nodes.length % 2 === 0;
92
+ const noMatch = this.nodes.length === 0;
93
+ const hasDivider = this._divider != null;
94
+
92
95
  this.cursor.resolveError();
93
96
 
94
- if (endsOnDivider) {
97
+ if ((hasDivider && endsOnDivider) || noMatch) {
95
98
  const parseError = new ParseError(
96
99
  `Did not find a repeating match of ${this.name}.`,
97
100
  this.mark,
package/src/tests/LookAhead.test.ts ADDED
@@ -0,0 +1,93 @@
1
+ /** @jest-environment node */
2
+ import Literal from "../patterns/value/Literal";
3
+ import Cursor from "../Cursor";
4
+ import LookAhead from "../patterns/LookAhead";
5
+ import NotValue from "../patterns/value/NotValue";
6
+ import OrValue from "../patterns/value/OrValue";
7
+ import RegexValue from "../patterns/value/RegexValue";
8
+ import AndValue from "../patterns/value/AndValue";
9
+
10
+ describe("LookAheadValue", () => {
11
+ test("Look for pattern.", () => {
12
+ const john = new Literal("john", "John");
13
+ const lookAheadValue = new LookAhead(john);
14
+ const cursor = new Cursor("John");
15
+ const node = lookAheadValue.parse(cursor);
16
+
17
+ expect(node).toBe(null);
18
+ expect(cursor.hasUnresolvedError()).toBe(false);
19
+ });
20
+
21
+ test("Look for a not pattern.", () => {
22
+ const john = new Literal("john", "John");
23
+ const lookAheadValue = new LookAhead(new NotValue("not-john", john));
24
+ const cursor = new Cursor("Joel");
25
+ const node = lookAheadValue.parse(cursor);
26
+
27
+ expect(node).toBe(null);
28
+ expect(cursor.hasUnresolvedError()).toBe(false);
29
+ });
30
+
31
+ test("Fail looking for a pattern.", () => {
32
+ const john = new Literal("john", "John");
33
+ const lookAheadValue = new LookAhead(john);
34
+ const cursor = new Cursor("Joel");
35
+ const node = lookAheadValue.parse(cursor);
36
+
37
+ expect(node).toBe(null);
38
+ expect(cursor.hasUnresolvedError()).toBe(true);
39
+ });
40
+
41
+ test("And a look ahead together.", () => {
42
+ const john = new Literal("john", "John");
43
+ const lookAheadValue = new LookAhead(john);
44
+ const cursor = new Cursor("Joel");
45
+ const node = lookAheadValue.parse(cursor);
46
+
47
+ expect(node).toBe(null);
48
+ expect(cursor.hasUnresolvedError()).toBe(true);
49
+ });
50
+
51
+ test("Negate pattern with literal.", () => {
52
+ const greaterThan = new Literal("greater-than", ">");
53
+ const lessThan = new Literal("less-than", "<");
54
+ const from = new Literal("from", "FROM");
55
+ const table = new Literal("table", "Table");
56
+ const operator = new OrValue("operator", [lessThan, greaterThan]);
57
+ const keywords = new AndValue("keywords-with-space", [
58
+ new OrValue("keywords", [from, table]),
59
+ new Literal("space", " "),
60
+ ]);
61
+ const identFirstPart = new RegexValue(
62
+ "ident-first-part",
63
+ "[a-zA-Z_$][a-zA-Z0-9_]*"
64
+ );
65
+ const identity = new AndValue("identity", [
66
+ new LookAhead(new NotValue("not-keywords", keywords)),
67
+ new LookAhead(new NotValue("not-operator", operator)),
68
+ identFirstPart,
69
+ ]);
70
+
71
+ const result = identity.parse(new Cursor("_goodName"));
72
+
73
+ expect(result).not.toBeNull();
74
+
75
+ const cursor1 = new Cursor("<badName");
76
+ const result1 = identity.parse(cursor1);
77
+
78
+ expect(result1).toBe(null);
79
+ expect(cursor1.hasUnresolvedError()).toBe(true);
80
+
81
+ const cursor2 = new Cursor("FROM_IS_OKAY");
82
+ const result2 = identity.parse(cursor2);
83
+
84
+ expect(result2).not.toBe(null);
85
+ expect(cursor2.hasUnresolvedError()).toBe(false);
86
+
87
+ const cursor3 = new Cursor("FROM ISBAD");
88
+ const result3 = identity.parse(cursor3);
89
+
90
+ expect(result3).toBe(null);
91
+ expect(cursor3.hasUnresolvedError()).toBe(true);
92
+ });
93
+ });
package/src/tests/NotValue.test.ts CHANGED
@@ -2,6 +2,10 @@
2
2
  import NotValue from "../patterns/value/NotValue";
3
3
  import Literal from "../patterns/value/Literal";
4
4
  import Cursor from "../Cursor";
5
+ import OrValue from "../patterns/value/OrValue";
6
+ import AndValue from "../patterns/value/AndValue";
7
+ import RepeatValue from "../patterns/value/RepeatValue";
8
+ import RegexValue from "../patterns/value/RegexValue";
5
9
 
6
10
  describe("NotValue", () => {
7
11
  test("Empty Constructor.", () => {
@@ -66,4 +70,7 @@ describe("NotValue", () => {
66
70
 
67
71
  expect(notJohn.name).toBe(clone.name);
68
72
  });
73
+
74
+
75
+
69
76
  });
package/src/tests/Pattern.test.ts CHANGED
@@ -211,9 +211,8 @@ describe("ValuePattern", () => {
211
211
  expect(tokens[1]).toBe("Doe");
212
212
 
213
213
  tokens = fullName.children[1].children[1].getNextTokens();
214
- expect(tokens.length).toBe(2);
214
+ expect(tokens.length).toBe(1);
215
215
  expect(tokens[0]).toBe("Edward");
216
- expect(tokens[1]).toBe("Doe");
217
216
  });
218
217
 
219
218
  test("getNextTokens, has child and at the beginning.", () => {
package/src/tests/ReferencePattern.test.ts ADDED
@@ -0,0 +1,24 @@
1
+ import Cursor from "../Cursor";
2
+ import ReferencePattern from "../patterns/ReferencePattern";
3
+ import AndValue from "../patterns/value/AndValue";
4
+ import Literal from "../patterns/value/Literal";
5
+ import OrValue from "../patterns/value/OrValue";
6
+
7
+ describe("ReferencePattern", () => {
8
+ test("Reference to node in different branch.", () => {
9
+ const a = new Literal("a", "a");
10
+ const b = new Literal("b", "b");
11
+ const c = new Literal("c", "c");
12
+ const a_b_c = new AndValue("a-and-b-and-c", [
13
+ a,
14
+ b,
15
+ new ReferencePattern("c"),
16
+ ]);
17
+ const b_c = new AndValue("b-and-c", [b, c]);
18
+ const main = new OrValue("main", [a_b_c, b_c]);
19
+
20
+ const result = main.parse(new Cursor("abc"));
21
+
22
+ expect(result).not.toBeNull();
23
+ });
24
+ });
package/src/tests/TextSuggester.test.ts CHANGED
@@ -267,6 +267,21 @@ describe("TextInspector", () => {
267
267
  expect(result.options.values.length).toBe(2);
268
268
  });
269
269
 
270
+ test("Suggest another item when its complete but is on a repeat.", () => {
271
+ const a = new Literal("a", "A");
272
+ const b = new Literal("b", "B");
273
+ const space = new Literal("space", " ");
274
+ const or = new OrComposite("names", [a, b]);
275
+
276
+ const repeat = new RepeatComposite("repeat", or, space);
277
+
278
+ const result = TextSuggester.suggest("A B", repeat);
279
+
280
+ expect(result.isComplete).toBe(true);
281
+ expect(result.options.values.length).toBe(1);
282
+ expect(result.options.values[0]).toBe(" ");
283
+ });
284
+
270
285
  test("Repeating pattern.", () => {
271
286
  const expression = generateExpression(["FlagX", "FlagY", "FlagZ"]);
272
287
  const result = TextSuggester.suggest("(FlagX AND ", expression);
package/src/tests/javascriptPatterns/json.ts CHANGED
@@ -13,7 +13,6 @@ import {
13
13
  import string from "./string";
14
14
  import number from "./number";
15
15
  import boolean from "./boolean";
16
- import Cursor from "../../Cursor";
17
16
 
18
17
  const openCurlyBracket = new Literal("open-curly-bracket", "{");
19
18
  const closeCurlyBracket = new Literal("close-curly-bracket", "}");
@@ -76,3 +75,5 @@ const json = new OrComposite("literals", [
76
75
  ]);
77
76
 
78
77
  export default json;
78
+
79
+