clarity-pattern-parser 3.0.12 → 3.0.14

package/src/patterns/composite/RepeatComposite.ts

@@ -75,7 +75,6 @@ export default class RepeatComposite extends CompositePattern {
             this.nodes.push(node);
 
             if (node.endIndex === this.cursor.lastIndex()) {
-              this.nodes.length = 0;
               this._processMatch();
               break;
             }
@@ -88,9 +87,10 @@ export default class RepeatComposite extends CompositePattern {
   }
 
   private _processMatch() {
+    const endsOnDivider = this.nodes.length % 2 === 0;
     this.cursor.resolveError();
 
-    if (this.nodes.length === 0) {
+    if (endsOnDivider) {
       this.cursor.throwError(
         new ParseError(
           `Did not find a repeating match of ${this.name}.`,

package/src/patterns/value/RepeatValue.ts

@@ -76,7 +76,6 @@ export default class RepeatValue extends ValuePattern {
             this.nodes.push(node);
 
             if (node.endIndex === this.cursor.lastIndex()) {
-              this.nodes.length = 0;
               this._processMatch();
               break;
             }
@@ -89,9 +88,10 @@ export default class RepeatValue extends ValuePattern {
   }
 
   private _processMatch() {
+    const endsOnDivider = this.nodes.length % 2 === 0;
     this.cursor.resolveError();
 
-    if (this.nodes.length === 0) {
+    if (endsOnDivider) {
       const parseError = new ParseError(
         `Did not find a repeating match of ${this.name}.`,
         this.mark,

package/src/tests/TextSuggester.test.ts

@@ -7,7 +7,40 @@ import OrValue from "../patterns/value/OrValue";
 import json from "./javascriptPatterns/json";
 import OrComposite from "../patterns/composite/OrComposite";
 import RepeatComposite from "../patterns/composite/RepeatComposite";
-import Cursor from "../Cursor";
+import AndComposite from "../patterns/composite/AndComposite";
+import RecursivePattern from "../patterns/RecursivePattern";
+
+function generateFlagFromList(flagNames: string[]) {
+  return flagNames.map((flagName) => {
+    return new Literal("flag-name", flagName);
+  });
+}
+
+function generateExpression(flagNames: string[]) {
+  const openParen = new Literal("open-paren", "(");
+  const closeParen = new Literal("close-paren", ")");
+  const andLiteral = new Literal("and-literal", "AND");
+  const space = new Literal("space", " ");
+  const orLiteral = new Literal("or-literal", "OR");
+  const and = new AndValue("and", [space, andLiteral, space]);
+  const or = new AndValue("or", [space, orLiteral, space]);
+
+  const booleanOperator = new OrComposite("booleanOperator", [and, or]);
+  const flag = new OrComposite("flags", generateFlagFromList(flagNames));
+  const group = new AndComposite("group", [
+    openParen,
+    new RecursivePattern("flag-expression"),
+    closeParen,
+  ]);
+  const flagOrGroup = new OrComposite("flag-or-group", [flag, group]);
+  const flagExpression = new RepeatComposite(
+    "flag-expression",
+    flagOrGroup,
+    booleanOperator
+  );
+
+  return flagExpression;
+}
 
 describe("TextInspector", () => {
   test("Partial Match", () => {
@@ -233,4 +266,15 @@ describe("TextInspector", () => {
     expect(result.options.values[1]).toBe("B");
     expect(result.options.values.length).toBe(2);
   });
+
+  test("Repeating pattern.", () => {
+    const expression = generateExpression(["FlagX", "FlagY", "FlagZ"]);
+    const result = TextSuggester.suggest("(FlagX AND ", expression);
+
+    expect(result.options.values.length).toBe(4);
+    expect(result.options.values[0]).toBe("FlagX");
+    expect(result.options.values[1]).toBe("FlagY");
+    expect(result.options.values[2]).toBe("FlagZ");
+    expect(result.options.values[3]).toBe("(");
+  });
 });