Implement workaround for URI parsing

Author: Jay Patel

grammar.abnf

@@ -20,7 +20,11 @@ infixAssertion = attributePath SP infixAssertionOperator SP infixAssertionValue
 infixAssertionOperator = "eq" / "ne" / "co" / "sw" / "ew" / "gt" / "lt" / "ge" / "le"
 infixAssertionValue = null / true / false / number / string
 
+<<<<<<< Updated upstream
 attributePath = [URI ":"] attributePathSegment *("." attributePathSegment)
+=======
+attributePath = [URI "<"] attributePathSegment *1("." attributePathSegment)
+>>>>>>> Stashed changes
 attributePathSegment  = ALPHA *("-" / "_" / DIGIT / ALPHA)
 
 ; rfc7159

grammar.js

@@ -24,6 +24,7 @@ class TrackMap {
   infixAssertionValue = [] as (null | boolean | number | string)[];
   attributePath = [] as string[][];
   attributePathSegment = [] as string[];
+  uri = [] as string[];
 }
 
 class Stat {
@@ -43,6 +44,7 @@ class Stat {
   infixAssertionValue = 0 as number;
   attributePath = 0 as number;
   attributePathSegment = 0 as number;
+  uri = 0 as number;
 }
 
 class StatsMap {
@@ -62,6 +64,7 @@ class StatsMap {
   infixAssertionValue = [] as Stat[];
   attributePath = [] as Stat[];
   attributePathSegment = [] as Stat[];
+  uri = [] as Stat[];
 }
 
 export class Yard {

src/Yard.ts

@@ -14,15 +14,17 @@ export function attributePath(
       break;
 
     case ids.SEM_POST:
-      const { attributePathSegment } = yard.post("attributePath");
+      const { attributePathSegment, uri } = yard.post("attributePath");
 
       if (attributePathSegment.length < 1) {
         throw new Error(
           `INVARIANT: Expected 1 or more attributePathSegment, but got ${attributePathSegment.length};`
         );
       }
-
-      yard.tracks.attributePath.push(attributePathSegment.reverse());
+      yard.tracks.attributePath.push([
+        ...uri,
+        ...attributePathSegment.reverse()
+      ]);
       break;
   }
 

src/attributePath.ts

@@ -19,6 +19,7 @@ import { infixAssertionOperator } from "./infixAssertionOperator";
 import { infixAssertionValue } from "./infixAssertionValue";
 import { attributePath } from "./attributePath";
 import { attributePathSegment } from "./attributePathSegment";
+import { uri } from "./uri";
 
 const grammar = new Grammar();
 const parser = new Parser();
@@ -39,7 +40,8 @@ parser.ast.callbacks = {
   infixAssertionOperator,
   infixAssertionValue,
   attributePath,
-  attributePathSegment
+  attributePathSegment,
+  uri
 };
 
 export function compileFilter(input: string): (data: any) => boolean {

src/index.ts

@@ -0,0 +1,23 @@
+import { ids, utils } from "apg-lib";
+import { Yard } from "./Yard";
+
+export function uri(
+  state: typeof ids.SEM_PRE | typeof ids.SEM_POST,
+  chars: number[],
+  phraseIndex: number,
+  phraseLength: number,
+  yard: Yard
+): typeof ids.SEM_OK | typeof ids.SEM_SKIP {
+  switch (state) {
+    case ids.SEM_PRE:
+      break;
+
+    case ids.SEM_POST:
+      yard.tracks.uri.push(
+        utils.charsToString(chars, phraseIndex, phraseLength)
+      );
+      break;
+  }
+
+  return ids.SEM_OK;
+}