@balena/odata-parser 2.3.0 → 2.4.0

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,18 @@
+- commits:
+    - subject: Add support for `/$count` with nested `$filter` in $orderby & $orderby
+      hash: 350c08b3a8a8877290f1c753a57e86404f0d9548
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+        See: https://github.com/balena-io/pinejs/issues/577
+        see: https://github.com/balena-io/pinejs/issues/577
+        Signed-off-by: Thodoris Greasidis <thodoris@balena.io>
+        signed-off-by: Thodoris Greasidis <thodoris@balena.io>
+      author: Thodoris Greasidis
+  version: 2.4.0
+  title: "'Add support for  with nested  in  & '"
+  date: 2022-09-15T07:00:40.239Z
 - commits:
     - subject: Add source map
       hash: a6bb5e67fac1cdcc69491800ad042f003fa13556
@@ -8,7 +23,7 @@
       author: Pagan Gazzard
   version: 2.3.0
   title: "'Add source map'"
-  date: 2022-06-06T16:33:40.752Z
+  date: 2022-06-06T15:59:20.389Z
 - commits:
     - subject: Update dependencies
       hash: e63884d3e86c2654fd601cacc53f3e8e61bb1d87

package/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v2.4.0
+## (2022-09-15)
+
+* Add support for `/$count` with nested `$filter` in $orderby & $orderby [Thodoris Greasidis]
+
 # v2.3.0
 ## (2022-06-06)
 

package/odata-parser.js

@@ -472,77 +472,78 @@ function peg$parse(input, options) {
   var peg$f43 = function(methodName) { return [] };
   var peg$f44 = function(methodName, args) { return [ 'call', { args: args, method: methodName } ] };
   var peg$f45 = function(path, paths) { return [path, ...paths] };
-  var peg$f46 = function(resource, property) { return true };
-  var peg$f47 = function(resource, property, count) { return { name: resource, property, count } };
-  var peg$f48 = function(path, paths) { return [path, ...paths] };
-  var peg$f49 = function(resource) { return true };
-  var peg$f50 = function(resource, count, option, options) { return CollapseObjectArray([option, ...options]) };
-  var peg$f51 = function(resource, count) { return {} };
-  var peg$f52 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count: count, options: optionsObj} };
-  var peg$f53 = function(resource, next) { return { name: resource, property: next } };
-  var peg$f54 = function(resource, lambda) { return { name: resource, lambda: lambda } };
-  var peg$f55 = function(resource, method) { return { name: resource, method: method } };
-  var peg$f56 = function(keyBind, keyBinds) { return CollapseObjectArray([keyBind, ...keyBinds]) };
-  var peg$f57 = function(name, value) { return { name, value }};
-  var peg$f58 = function(resource) { return { resource } };
-  var peg$f59 = function(result, key) { result.key = key };
-  var peg$f60 = function(result, link) {result.link = link};
-  var peg$f61 = function(result, property) {result.property = property};
-  var peg$f62 = function(result) {result.count = true};
-  var peg$f63 = function(result) { return result };
-  var peg$f64 = function(result, link) {result.link = link};
-  var peg$f65 = function(result, property) {result.property = property};
-  var peg$f66 = function(result) { return result };
-  var peg$f67 = function(result, options) {result.options = options};
-  var peg$f68 = function(result) { return result };
-  var peg$f69 = function(resource) { return { resource } };
-  var peg$f70 = function(result, key) { result.key = key };
-  var peg$f71 = function(result, link) {result.link = link};
-  var peg$f72 = function(result, property) {result.property = property};
-  var peg$f73 = function(result) {result.count = true};
-  var peg$f74 = function(result, options) {result.options = options};
-  var peg$f75 = function(result) { return result };
-  var peg$f76 = function(resourceName) { return decodeURIComponent(resourceName) };
-  var peg$f77 = function(sign, d) { return Number(sign + d) };
-  var peg$f78 = function(d) { return parseInt(d, 10) };
-  var peg$f79 = function() { return null };
-  var peg$f80 = function() { return true };
-  var peg$f81 = function() { return false };
-  var peg$f82 = function(sign, day, hour, minute, second) {return hour || minute || second};
-  var peg$f83 = function(sign, day, hour, minute, second) {
+  var peg$f46 = function(resource, property, option) { return CollapseObjectArray([option]) };
+  var peg$f47 = function(resource, property, optionsObj) { return { count: true, options: optionsObj } };
+  var peg$f48 = function(resource, property, countOptions) { return { name: resource, property, ...countOptions } };
+  var peg$f49 = function(path, paths) { return [path, ...paths] };
+  var peg$f50 = function(resource) { return true };
+  var peg$f51 = function(resource, count, option, options) { return CollapseObjectArray([option, ...options]) };
+  var peg$f52 = function(resource, count) { return {} };
+  var peg$f53 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count: count, options: optionsObj} };
+  var peg$f54 = function(resource, next) { return { name: resource, property: next } };
+  var peg$f55 = function(resource, lambda) { return { name: resource, lambda: lambda } };
+  var peg$f56 = function(resource, method) { return { name: resource, method: method } };
+  var peg$f57 = function(keyBind, keyBinds) { return CollapseObjectArray([keyBind, ...keyBinds]) };
+  var peg$f58 = function(name, value) { return { name, value }};
+  var peg$f59 = function(resource) { return { resource } };
+  var peg$f60 = function(result, key) { result.key = key };
+  var peg$f61 = function(result, link) {result.link = link};
+  var peg$f62 = function(result, property) {result.property = property};
+  var peg$f63 = function(result) {result.count = true};
+  var peg$f64 = function(result) { return result };
+  var peg$f65 = function(result, link) {result.link = link};
+  var peg$f66 = function(result, property) {result.property = property};
+  var peg$f67 = function(result) { return result };
+  var peg$f68 = function(result, options) {result.options = options};
+  var peg$f69 = function(result) { return result };
+  var peg$f70 = function(resource) { return { resource } };
+  var peg$f71 = function(result, key) { result.key = key };
+  var peg$f72 = function(result, link) {result.link = link};
+  var peg$f73 = function(result, property) {result.property = property};
+  var peg$f74 = function(result) {result.count = true};
+  var peg$f75 = function(result, options) {result.options = options};
+  var peg$f76 = function(result) { return result };
+  var peg$f77 = function(resourceName) { return decodeURIComponent(resourceName) };
+  var peg$f78 = function(sign, d) { return Number(sign + d) };
+  var peg$f79 = function(d) { return parseInt(d, 10) };
+  var peg$f80 = function() { return null };
+  var peg$f81 = function() { return true };
+  var peg$f82 = function() { return false };
+  var peg$f83 = function(sign, day, hour, minute, second) {return hour || minute || second};
+  var peg$f84 = function(sign, day, hour, minute, second) {
 			return {
 				hour: hour || undefined,
 				minute: minute || undefined,
 				second: second || undefined
 			}
 		};
-  var peg$f84 = function(sign, day, time) {return day || time};
-  var peg$f85 = function(sign, day, time) { return {
+  var peg$f85 = function(sign, day, time) {return day || time};
+  var peg$f86 = function(sign, day, time) { return {
 		negative: sign === '-',
 		day: day || undefined,
 		hour: time ? time.hour : undefined,
 		minute: time ? time.minute : undefined,
 		second: time ? time.second : undefined,
 	} };
-  var peg$f86 = function(d) { return Number(d) };
-  var peg$f87 = function(text) { return decodeURIComponent(text) };
-  var peg$f88 = function() { return '+' };
-  var peg$f89 = function() { return '\'' };
-  var peg$f90 = function(text) { return decodeURIComponent(text.join('')) };
-  var peg$f91 = function(param) { return { bind: '@' + param } };
-  var peg$f92 = function(n) { return Bind('Real', n) };
-  var peg$f93 = function() { return 'Date Time' };
-  var peg$f94 = function() { return 'Date' };
-  var peg$f95 = function(type, date) { return Date.parse(date) };
-  var peg$f96 = function(type, date) { return isNaN(date) };
-  var peg$f97 = function(type, date) { return [type, date] };
-  var peg$f98 = function(d) { return Bind(d[0], d[1]) };
-  var peg$f99 = function(b) { return Bind('Boolean', b) };
-  var peg$f100 = function(resource) {
+  var peg$f87 = function(d) { return Number(d) };
+  var peg$f88 = function(text) { return decodeURIComponent(text) };
+  var peg$f89 = function() { return '+' };
+  var peg$f90 = function() { return '\'' };
+  var peg$f91 = function(text) { return decodeURIComponent(text.join('')) };
+  var peg$f92 = function(param) { return { bind: '@' + param } };
+  var peg$f93 = function(n) { return Bind('Real', n) };
+  var peg$f94 = function() { return 'Date Time' };
+  var peg$f95 = function() { return 'Date' };
+  var peg$f96 = function(type, date) { return Date.parse(date) };
+  var peg$f97 = function(type, date) { return isNaN(date) };
+  var peg$f98 = function(type, date) { return [type, date] };
+  var peg$f99 = function(d) { return Bind(d[0], d[1]) };
+  var peg$f100 = function(b) { return Bind('Boolean', b) };
+  var peg$f101 = function(resource) {
 		var bind = Bind('ContentReference', resource)
 		return { resource: bind, key: bind }
 	};
-  var peg$f101 = function(t) { return Bind('Text', t) };
+  var peg$f102 = function(t) { return Bind('Text', t) };
   var peg$currPos = 0;
   var peg$savedPos = 0;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -3259,7 +3260,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsePropertyPath() {
-    var s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     var key = peg$currPos * 62 + 31;
     var cached = peg$resultsCache[key];
@@ -3305,15 +3306,66 @@ function peg$parse(input, options) {
         if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
       if (s4 !== peg$FAILED) {
+        s5 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 40) {
+          s6 = peg$c32;
+          peg$currPos++;
+        } else {
+          s6 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        }
+        if (s6 !== peg$FAILED) {
+          s7 = peg$currPos;
+          s8 = peg$parseDollar();
+          if (s8 !== peg$FAILED) {
+            s9 = peg$parseFilterByOption();
+            if (s9 !== peg$FAILED) {
+              peg$savedPos = s7;
+              s7 = peg$f46(s1, s2, s9);
+            } else {
+              peg$currPos = s7;
+              s7 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s7;
+            s7 = peg$FAILED;
+          }
+          if (s7 !== peg$FAILED) {
+            if (input.charCodeAt(peg$currPos) === 41) {
+              s8 = peg$c33;
+              peg$currPos++;
+            } else {
+              s8 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e35); }
+            }
+            if (s8 !== peg$FAILED) {
+              s5 = s7;
+            } else {
+              peg$currPos = s5;
+              s5 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
+        }
+        if (s5 === peg$FAILED) {
+          s5 = null;
+        }
         peg$savedPos = s3;
-        s4 = peg$f46(s1, s2);
+        s3 = peg$f47(s1, s2, s5);
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
       }
-      s3 = s4;
       if (s3 === peg$FAILED) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f47(s1, s2, s3);
+      s0 = peg$f48(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3384,7 +3436,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f48(s1, s2);
+      s0 = peg$f49(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3420,7 +3472,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f49(s1);
+        s3 = peg$f50(s1);
       }
       s2 = s3;
       if (s2 === peg$FAILED) {
@@ -3483,7 +3535,7 @@ function peg$parse(input, options) {
             }
           }
           peg$savedPos = s5;
-          s5 = peg$f50(s1, s2, s6, s7);
+          s5 = peg$f51(s1, s2, s6, s7);
         } else {
           peg$currPos = s5;
           s5 = peg$FAILED;
@@ -3492,7 +3544,7 @@ function peg$parse(input, options) {
           s5 = peg$currPos;
           s6 = '';
           peg$savedPos = s5;
-          s6 = peg$f51(s1, s2);
+          s6 = peg$f52(s1, s2);
           s5 = s6;
         }
         if (s5 !== peg$FAILED) {
@@ -3544,7 +3596,7 @@ function peg$parse(input, options) {
         s4 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f52(s1, s2, s3, s4);
+      s0 = peg$f53(s1, s2, s3, s4);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3582,7 +3634,7 @@ function peg$parse(input, options) {
         s4 = peg$parseLambdaPropertyPath();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f53(s1, s4);
+          s4 = peg$f54(s1, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -3590,7 +3642,7 @@ function peg$parse(input, options) {
           s4 = peg$parseLambdaMethodCall();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s3;
-            s4 = peg$f54(s1, s4);
+            s4 = peg$f55(s1, s4);
           }
           s3 = s4;
           if (s3 === peg$FAILED) {
@@ -3598,7 +3650,7 @@ function peg$parse(input, options) {
             s4 = peg$parseResourceMethodCall();
             if (s4 !== peg$FAILED) {
               peg$savedPos = s3;
-              s4 = peg$f55(s1, s4);
+              s4 = peg$f56(s1, s4);
             }
             s3 = s4;
           }
@@ -3694,7 +3746,7 @@ function peg$parse(input, options) {
             }
           }
           peg$savedPos = s2;
-          s2 = peg$f56(s3, s4);
+          s2 = peg$f57(s3, s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -3754,7 +3806,7 @@ function peg$parse(input, options) {
         s3 = peg$parseKeyBind();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f57(s1, s3);
+          s0 = peg$f58(s1, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3862,7 +3914,7 @@ function peg$parse(input, options) {
       s4 = peg$parseResourceName();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s3;
-        s4 = peg$f58(s4);
+        s4 = peg$f59(s4);
       }
       s3 = s4;
       if (s3 !== peg$FAILED) {
@@ -3871,7 +3923,7 @@ function peg$parse(input, options) {
         s6 = peg$parseKey();
         if (s6 !== peg$FAILED) {
           peg$savedPos = s5;
-          s6 = peg$f59(s3, s6);
+          s6 = peg$f60(s3, s6);
         }
         s5 = s6;
         if (s5 !== peg$FAILED) {
@@ -3879,7 +3931,7 @@ function peg$parse(input, options) {
           s7 = peg$parseLinks();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s6;
-            s7 = peg$f60(s3, s7);
+            s7 = peg$f61(s3, s7);
           }
           s6 = s7;
           if (s6 === peg$FAILED) {
@@ -3887,7 +3939,7 @@ function peg$parse(input, options) {
             s7 = peg$parseSubPathSegment();
             if (s7 !== peg$FAILED) {
               peg$savedPos = s6;
-              s7 = peg$f61(s3, s7);
+              s7 = peg$f62(s3, s7);
             }
             s6 = s7;
           }
@@ -3911,7 +3963,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             peg$savedPos = s4;
-            s5 = peg$f62(s3);
+            s5 = peg$f63(s3);
           }
           s4 = s5;
         }
@@ -3919,7 +3971,7 @@ function peg$parse(input, options) {
           s4 = null;
         }
         peg$savedPos = s1;
-        s1 = peg$f63(s3);
+        s1 = peg$f64(s3);
       } else {
         peg$currPos = s1;
         s1 = peg$FAILED;
@@ -3936,7 +3988,7 @@ function peg$parse(input, options) {
         s4 = peg$parseLinks();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f64(s2, s4);
+          s4 = peg$f65(s2, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -3944,7 +3996,7 @@ function peg$parse(input, options) {
           s4 = peg$parseSubPathSegment();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s3;
-            s4 = peg$f65(s2, s4);
+            s4 = peg$f66(s2, s4);
           }
           s3 = s4;
         }
@@ -3952,7 +4004,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s1;
-        s1 = peg$f66(s2);
+        s1 = peg$f67(s2);
       } else {
         peg$currPos = s1;
         s1 = peg$FAILED;
@@ -3972,7 +4024,7 @@ function peg$parse(input, options) {
         s5 = peg$parseQueryOptions();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s4;
-          s5 = peg$f67(s1, s5);
+          s5 = peg$f68(s1, s5);
         }
         s4 = s5;
         if (s4 === peg$FAILED) {
@@ -3988,7 +4040,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f68(s1);
+      s0 = peg$f69(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4024,7 +4076,7 @@ function peg$parse(input, options) {
       s3 = peg$parseResourceName();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f69(s3);
+        s3 = peg$f70(s3);
       }
       s2 = s3;
       if (s2 !== peg$FAILED) {
@@ -4032,7 +4084,7 @@ function peg$parse(input, options) {
         s4 = peg$parseKey();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f70(s2, s4);
+          s4 = peg$f71(s2, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -4050,7 +4102,7 @@ function peg$parse(input, options) {
           s6 = peg$parseSubPathSegment();
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f71(s2, s6);
+            s4 = peg$f72(s2, s6);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4064,7 +4116,7 @@ function peg$parse(input, options) {
           s5 = peg$parseSubPathSegment();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s4;
-            s5 = peg$f72(s2, s5);
+            s5 = peg$f73(s2, s5);
           }
           s4 = s5;
         }
@@ -4081,7 +4133,7 @@ function peg$parse(input, options) {
         }
         if (s6 !== peg$FAILED) {
           peg$savedPos = s5;
-          s6 = peg$f73(s2);
+          s6 = peg$f74(s2);
         }
         s5 = s6;
         if (s5 === peg$FAILED) {
@@ -4100,7 +4152,7 @@ function peg$parse(input, options) {
           s9 = peg$parseQueryOptions();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s8;
-            s9 = peg$f74(s2, s9);
+            s9 = peg$f75(s2, s9);
           }
           s8 = s9;
           if (s8 === peg$FAILED) {
@@ -4116,7 +4168,7 @@ function peg$parse(input, options) {
           s6 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f75(s2);
+        s0 = peg$f76(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4174,7 +4226,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f76(s1);
+      s1 = peg$f77(s1);
     }
     s0 = s1;
 
@@ -4281,7 +4333,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f77(s1, s2);
+        s0 = peg$f78(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4339,7 +4391,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f78(s1);
+      s1 = peg$f79(s1);
     }
     s0 = s1;
 
@@ -4370,7 +4422,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f79();
+      s1 = peg$f80();
     }
     s0 = s1;
 
@@ -4401,7 +4453,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f80();
+      s1 = peg$f81();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -4415,7 +4467,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f81();
+        s1 = peg$f82();
       }
       s0 = s1;
     }
@@ -4560,7 +4612,7 @@ function peg$parse(input, options) {
                 s10 = null;
               }
               peg$savedPos = peg$currPos;
-              s11 = peg$f82(s3, s5, s8, s9, s10);
+              s11 = peg$f83(s3, s5, s8, s9, s10);
               if (s11) {
                 s11 = undefined;
               } else {
@@ -4568,7 +4620,7 @@ function peg$parse(input, options) {
               }
               if (s11 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f83(s3, s5, s8, s9, s10);
+                s6 = peg$f84(s3, s5, s8, s9, s10);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -4581,7 +4633,7 @@ function peg$parse(input, options) {
               s6 = null;
             }
             peg$savedPos = peg$currPos;
-            s7 = peg$f84(s3, s5, s6);
+            s7 = peg$f85(s3, s5, s6);
             if (s7) {
               s7 = undefined;
             } else {
@@ -4591,7 +4643,7 @@ function peg$parse(input, options) {
               s8 = peg$parseApostrophe();
               if (s8 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f85(s3, s5, s6);
+                s0 = peg$f86(s3, s5, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -4712,7 +4764,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f86(s1);
+      s1 = peg$f87(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -4758,7 +4810,7 @@ function peg$parse(input, options) {
     }
     s1 = input.substring(s1, peg$currPos);
     peg$savedPos = s0;
-    s1 = peg$f87(s1);
+    s1 = peg$f88(s1);
     s0 = s1;
 
     peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
@@ -4796,7 +4848,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f88();
+        s1 = peg$f89();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -4848,7 +4900,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f89();
+        s1 = peg$f90();
       }
       s0 = s1;
     }
@@ -4970,7 +5022,7 @@ function peg$parse(input, options) {
       s3 = peg$parseApostrophe();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f90(s2);
+        s0 = peg$f91(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5009,7 +5061,7 @@ function peg$parse(input, options) {
       s2 = peg$parseResourceName();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f91(s2);
+        s0 = peg$f92(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5040,7 +5092,7 @@ function peg$parse(input, options) {
     s1 = peg$parseNumber();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f92(s1);
+      s1 = peg$f93(s1);
     }
     s0 = s1;
 
@@ -5072,7 +5124,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s1;
-      s2 = peg$f93();
+      s2 = peg$f94();
     }
     s1 = s2;
     if (s1 === peg$FAILED) {
@@ -5086,7 +5138,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s1;
-        s2 = peg$f94();
+        s2 = peg$f95();
       }
       s1 = s2;
     }
@@ -5095,12 +5147,12 @@ function peg$parse(input, options) {
       s3 = peg$parseQuotedText();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f95(s1, s3);
+        s3 = peg$f96(s1, s3);
       }
       s2 = s3;
       if (s2 !== peg$FAILED) {
         peg$savedPos = peg$currPos;
-        s3 = peg$f96(s1, s2);
+        s3 = peg$f97(s1, s2);
         if (s3) {
           s3 = peg$FAILED;
         } else {
@@ -5108,7 +5160,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f97(s1, s2);
+          s0 = peg$f98(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5143,7 +5195,7 @@ function peg$parse(input, options) {
     s1 = peg$parseDate();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f98(s1);
+      s1 = peg$f99(s1);
     }
     s0 = s1;
 
@@ -5168,7 +5220,7 @@ function peg$parse(input, options) {
     s1 = peg$parseBoolean();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f99(s1);
+      s1 = peg$f100(s1);
     }
     s0 = s1;
 
@@ -5201,7 +5253,7 @@ function peg$parse(input, options) {
       s2 = peg$parseResourceName();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f100(s2);
+        s0 = peg$f101(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5232,7 +5284,7 @@ function peg$parse(input, options) {
     s1 = peg$parseQuotedText();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f101(s1);
+      s1 = peg$f102(s1);
     }
     s0 = s1;
 

package/odata-parser.pegjs

@@ -458,11 +458,19 @@ PropertyPath =
 		'/'
 		@PropertyPath
 	)?
-	count:(
+	countOptions:(
 		'/$count'
-		{ return true }
+		optionsObj:(
+			'('
+			@(	Dollar
+				option:FilterByOption
+				{ return CollapseObjectArray([option]) }
+			)
+			')'
+		)?
+		{ return { count: true, options: optionsObj } }
 	)?
-	{ return { name: resource, property, count } }
+	{ return { name: resource, property, ...countOptions } }
 ExpandPropertyPathList =
 	path:ExpandPropertyPath
 	paths:(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -42,6 +42,6 @@
     "_": "test/run.js"
   },
   "versionist": {
-    "publishedAt": "2022-06-06T16:33:40.852Z"
+    "publishedAt": "2022-09-15T07:00:40.336Z"
   }
 }

package/test/filterby.js

@@ -401,6 +401,53 @@ export default function (test) {
 			assert.equal(result.options.$filter[2].bind, 0));
 	});
 
+	test(
+		'$filter=Products/$count($filter=Price lt 5) ge 1',
+		[5, 1],
+		function (result) {
+			it('A filter should be present', () =>
+				assert.notEqual(result.options.$filter, null));
+
+			it("Filter should be an instance of 'ge'", () =>
+				assert.equal(result.options.$filter[0], 'ge'));
+
+			it('lhr should have the Product count', function () {
+				expect(result.options.$filter[1])
+					.to.have.property('name')
+					.that.equals('Products');
+				expect(result.options.$filter[1])
+					.to.have.property('count')
+					.that.equals(true);
+			});
+
+			it('count options are present on the Product count', () => {
+				assert.notEqual(result.options.$filter[1].options, null);
+				console.log('***', result.options.$filter[1].options);
+			});
+
+			it('A filter should be present on the Product count lhs', () =>
+				assert.notEqual(result.options.$filter[1].options.$filter, null));
+
+			it(`has a Product count filter that is an instance of 'ge'`, () =>
+				assert.equal(result.options.$filter[1].options.$filter[0], 'lt'));
+
+			it(`has an lhs on the Product count filter that is an instance of 'ge'`, () => {
+				expect(result.options.$filter[1].options.$filter[1])
+					.to.have.property('name')
+					.that.equals('Price');
+			});
+
+			it(`has an rhs on the Product count filter that is $0`, () => {
+				expect(result.options.$filter[1].options.$filter[2])
+					.to.have.property('bind')
+					.that.equals(0);
+			});
+
+			it('rhr should be $1', () =>
+				assert.equal(result.options.$filter[2].bind, 1));
+		},
+	);
+
 	test("$filter=note eq 'foobar'", ['foobar'], function (result) {
 		it('A filter should be present', () =>
 			assert.notEqual(result.options.$filter, null));

package/test/orderby.js

@@ -1,4 +1,5 @@
 import * as assert from 'assert';
+import filterby from './filterby';
 
 export default (test) => {
 	describe('$orderby', function () {
@@ -91,5 +92,46 @@ export default (test) => {
 				);
 			});
 		});
+
+		test('$orderby=PropertyOne/$count', function (result) {
+			it('sort options are present on the result', () => {
+				assert.notEqual(result.options.$orderby, null);
+			});
+			it('sort options have property one name specified', () => {
+				assert.equal(result.options.$orderby.properties[0].name, 'PropertyOne');
+			});
+			it('has count defined', () => {
+				assert.equal(result.options.$orderby.properties[0].count, true);
+			});
+		});
+
+		const testFilterOption = function (nestedTest, input, ...optArgs) {
+			const expectation = optArgs.pop();
+			nestedTest(
+				`$orderby=PropertyOne/$count(${input})`,
+				...optArgs,
+				function (result) {
+					it('sort options are present on the result', () => {
+						assert.notEqual(result.options.$orderby, null);
+					});
+					it('sort options have property one name specified', () => {
+						assert.equal(
+							result.options.$orderby.properties[0].name,
+							'PropertyOne',
+						);
+					});
+					it('has count defined', () => {
+						assert.equal(result.options.$orderby.properties[0].count, true);
+					});
+					expectation(result?.options?.$orderby?.properties?.[0]);
+				},
+			);
+		};
+
+		const nestedFilterTest = testFilterOption.bind(null, test);
+		nestedFilterTest.skip = testFilterOption.bind(null, test.skip);
+		nestedFilterTest.only = testFilterOption.bind(null, test.only);
+
+		filterby(nestedFilterTest);
 	});
 };