@balena/odata-parser 3.0.8 → 3.1.0

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Use bind vars for $top and $skip options
+      hash: f160a140209cc5c9d3abc617cf8de7a37a0abf16
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Pagan Gazzard
+  version: 3.1.0
+  title: ""
+  date: 2024-10-03T19:30:42.169Z
 - commits:
     - subject: Fix type checking of the declaration file
       hash: 17dc377da3031f28bb5f2ffaff9b2185d65159aa
@@ -8,7 +19,7 @@
       author: Pagan Gazzard
   version: 3.0.8
   title: ""
-  date: 2024-06-03T15:30:15.363Z
+  date: 2024-06-04T09:56:51.182Z
 - commits:
     - subject: Update dependency husky to v9
       hash: 8d5929cbbce1765e8ad14a84a1b6e669daedd9a8

package/CHANGELOG.md

@@ -4,8 +4,13 @@ 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/).
 
+# v3.1.0
+## (2024-10-03)
+
+* Use bind vars for $top and $skip options [Pagan Gazzard]
+
 # v3.0.8
-## (2024-06-03)
+## (2024-06-04)
 
 * Fix type checking of the declaration file [Pagan Gazzard]
 

package/odata-parser.js

@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.2.
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -648,18 +648,19 @@ function peg$parse(input, options) {
   var peg$f86 = function(text) { return decodeURIComponent(text.join('')) };
   var peg$f87 = function(param) { return { bind: '@' + param } };
   var peg$f88 = function(n) { return Bind('Real', n) };
-  var peg$f89 = function() { return 'Date Time' };
-  var peg$f90 = function() { return 'Date' };
-  var peg$f91 = function(type, date) { return Date.parse(date) };
-  var peg$f92 = function(type, date) { return isNaN(date) };
-  var peg$f93 = function(type, date) { return [type, date] };
-  var peg$f94 = function(d) { return Bind(d[0], d[1]) };
-  var peg$f95 = function(b) { return Bind('Boolean', b) };
-  var peg$f96 = function(resource) {
+  var peg$f89 = function(n) { return Bind('Integer', n) };
+  var peg$f90 = function() { return 'Date Time' };
+  var peg$f91 = function() { return 'Date' };
+  var peg$f92 = function(type, date) { return Date.parse(date) };
+  var peg$f93 = function(type, date) { return isNaN(date) };
+  var peg$f94 = function(type, date) { return [type, date] };
+  var peg$f95 = function(d) { return Bind(d[0], d[1]) };
+  var peg$f96 = function(b) { return Bind('Boolean', b) };
+  var peg$f97 = function(resource) {
 		const bind = Bind('ContentReference', resource)
 		return { resource: bind, key: bind }
 	};
-  var peg$f97 = function(t) { return Bind('Text', t) };
+  var peg$f98 = function(t) { return Bind('Text', t) };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -827,7 +828,7 @@ function peg$parse(input, options) {
   function peg$parseProcess() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 0;
+    var key = peg$currPos * 63 + 0;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -866,7 +867,7 @@ function peg$parse(input, options) {
   function peg$parseProcessRule() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 1;
+    var key = peg$currPos * 63 + 1;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -889,7 +890,7 @@ function peg$parse(input, options) {
   function peg$parseOData() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 2;
+    var key = peg$currPos * 63 + 2;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -944,7 +945,7 @@ function peg$parse(input, options) {
   function peg$parseQueryOptions() {
     var s0, s1, s2, s3, s4;
 
-    var key = peg$currPos * 62 + 3;
+    var key = peg$currPos * 63 + 3;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -999,7 +1000,7 @@ function peg$parse(input, options) {
   function peg$parseQueryOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 4;
+    var key = peg$currPos * 63 + 4;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1061,7 +1062,7 @@ function peg$parse(input, options) {
   function peg$parseDollar() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 5;
+    var key = peg$currPos * 63 + 5;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1101,7 +1102,7 @@ function peg$parse(input, options) {
   function peg$parseParameterAliasOption() {
     var s0, s1, s2, s3, s4, s5;
 
-    var key = peg$currPos * 62 + 6;
+    var key = peg$currPos * 63 + 6;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1192,7 +1193,7 @@ function peg$parse(input, options) {
   function peg$parseOperationParam() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 7;
+    var key = peg$currPos * 63 + 7;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1227,7 +1228,7 @@ function peg$parse(input, options) {
   function peg$parseSortOption() {
     var s0, s1, s2, s3, s4, s5;
 
-    var key = peg$currPos * 62 + 8;
+    var key = peg$currPos * 63 + 8;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1296,7 +1297,7 @@ function peg$parse(input, options) {
   function peg$parseSortProperty() {
     var s0, s1, s2, s3, s4;
 
-    var key = peg$currPos * 62 + 9;
+    var key = peg$currPos * 63 + 9;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1364,7 +1365,7 @@ function peg$parse(input, options) {
   function peg$parseTopOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 10;
+    var key = peg$currPos * 63 + 10;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1382,7 +1383,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parseUnsignedInteger();
+      s2 = peg$parseUnsignedIntegerBind();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f16(s2);
@@ -1403,7 +1404,7 @@ function peg$parse(input, options) {
   function peg$parseSkipOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 11;
+    var key = peg$currPos * 63 + 11;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1421,7 +1422,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parseUnsignedInteger();
+      s2 = peg$parseUnsignedIntegerBind();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f17(s2);
@@ -1442,7 +1443,7 @@ function peg$parse(input, options) {
   function peg$parseInlineCountOption() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 12;
+    var key = peg$currPos * 63 + 12;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1503,7 +1504,7 @@ function peg$parse(input, options) {
   function peg$parseCountOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 13;
+    var key = peg$currPos * 63 + 13;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1542,7 +1543,7 @@ function peg$parse(input, options) {
   function peg$parseExpandOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 14;
+    var key = peg$currPos * 63 + 14;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1581,7 +1582,7 @@ function peg$parse(input, options) {
   function peg$parseSelectOption() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 15;
+    var key = peg$currPos * 63 + 15;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1635,7 +1636,7 @@ function peg$parse(input, options) {
   function peg$parseFilterByOption() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 16;
+    var key = peg$currPos * 63 + 16;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1674,7 +1675,7 @@ function peg$parse(input, options) {
   function peg$parseContentType() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8;
 
-    var key = peg$currPos * 62 + 17;
+    var key = peg$currPos * 63 + 17;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1839,7 +1840,7 @@ function peg$parse(input, options) {
   function peg$parseFormatOption() {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
-    var key = peg$currPos * 62 + 18;
+    var key = peg$currPos * 63 + 18;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1956,7 +1957,7 @@ function peg$parse(input, options) {
   function peg$parseFilterByExpression() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 19;
+    var key = peg$currPos * 63 + 19;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -1987,7 +1988,7 @@ function peg$parse(input, options) {
   function peg$parseFilterByExpressionLoop() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    var key = peg$currPos * 62 + 20;
+    var key = peg$currPos * 63 + 20;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2175,7 +2176,7 @@ function peg$parse(input, options) {
   function peg$parseFilterByValue() {
     var s0;
 
-    var key = peg$currPos * 62 + 21;
+    var key = peg$currPos * 63 + 21;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2206,7 +2207,7 @@ function peg$parse(input, options) {
   function peg$parsePrimitive() {
     var s0, s1, s2, s3, s4, s5;
 
-    var key = peg$currPos * 62 + 22;
+    var key = peg$currPos * 63 + 22;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2282,7 +2283,7 @@ function peg$parse(input, options) {
   function peg$parseGroupedPrecedenceExpression() {
     var s0, s1, s2, s3, s4, s5;
 
-    var key = peg$currPos * 62 + 23;
+    var key = peg$currPos * 63 + 23;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2334,7 +2335,7 @@ function peg$parse(input, options) {
   function peg$parseFilterByOperand() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 24;
+    var key = peg$currPos * 63 + 24;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2481,7 +2482,7 @@ function peg$parse(input, options) {
   function peg$parseFilterNegateExpression() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    var key = peg$currPos * 62 + 25;
+    var key = peg$currPos * 63 + 25;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2562,7 +2563,7 @@ function peg$parse(input, options) {
   function peg$parseGroupedPrimitive() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8;
 
-    var key = peg$currPos * 62 + 26;
+    var key = peg$currPos * 63 + 26;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -2652,7 +2653,7 @@ function peg$parse(input, options) {
   function peg$parseFilterMethodCallExpression() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
 
-    var key = peg$currPos * 62 + 27;
+    var key = peg$currPos * 63 + 27;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3053,7 +3054,7 @@ function peg$parse(input, options) {
   function peg$parseLambdaMethodCall() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8;
 
-    var key = peg$currPos * 62 + 28;
+    var key = peg$currPos * 63 + 28;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3145,7 +3146,7 @@ function peg$parse(input, options) {
   function peg$parseResourceMethodCall() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
 
-    var key = peg$currPos * 62 + 29;
+    var key = peg$currPos * 63 + 29;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3258,7 +3259,7 @@ function peg$parse(input, options) {
   function peg$parsePropertyPathList() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 30;
+    var key = peg$currPos * 63 + 30;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3307,7 +3308,7 @@ function peg$parse(input, options) {
   function peg$parsePropertyPath() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    var key = peg$currPos * 62 + 31;
+    var key = peg$currPos * 63 + 31;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3424,7 +3425,7 @@ function peg$parse(input, options) {
   function peg$parseExpandPropertyPathList() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 32;
+    var key = peg$currPos * 63 + 32;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3473,7 +3474,7 @@ function peg$parse(input, options) {
   function peg$parseExpandPropertyPath() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    var key = peg$currPos * 62 + 33;
+    var key = peg$currPos * 63 + 33;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3617,7 +3618,7 @@ function peg$parse(input, options) {
   function peg$parseLambdaPropertyPath() {
     var s0, s1, s2, s3, s4;
 
-    var key = peg$currPos * 62 + 34;
+    var key = peg$currPos * 63 + 34;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3685,7 +3686,7 @@ function peg$parse(input, options) {
   function peg$parseKey() {
     var s0, s1, s2, s3, s4, s5, s6;
 
-    var key = peg$currPos * 62 + 35;
+    var key = peg$currPos * 63 + 35;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3774,7 +3775,7 @@ function peg$parse(input, options) {
   function peg$parseNamedKeyBind() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 36;
+    var key = peg$currPos * 63 + 36;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3819,7 +3820,7 @@ function peg$parse(input, options) {
   function peg$parseKeyBind() {
     var s0;
 
-    var key = peg$currPos * 62 + 37;
+    var key = peg$currPos * 63 + 37;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3844,7 +3845,7 @@ function peg$parse(input, options) {
   function peg$parseLinks() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 38;
+    var key = peg$currPos * 63 + 38;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -3882,7 +3883,7 @@ function peg$parse(input, options) {
   function peg$parsePathSegment() {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
-    var key = peg$currPos * 62 + 39;
+    var key = peg$currPos * 63 + 39;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4045,7 +4046,7 @@ function peg$parse(input, options) {
   function peg$parseSubPathSegment() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    var key = peg$currPos * 62 + 40;
+    var key = peg$currPos * 63 + 40;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4177,7 +4178,7 @@ function peg$parse(input, options) {
   function peg$parseResourceName() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 41;
+    var key = peg$currPos * 63 + 41;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4229,7 +4230,7 @@ function peg$parse(input, options) {
   function peg$parseNumber() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8;
 
-    var key = peg$currPos * 62 + 42;
+    var key = peg$currPos * 63 + 42;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4342,7 +4343,7 @@ function peg$parse(input, options) {
   function peg$parseUnsignedInteger() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 43;
+    var key = peg$currPos * 63 + 43;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4394,7 +4395,7 @@ function peg$parse(input, options) {
   function peg$parseNull() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 44;
+    var key = peg$currPos * 63 + 44;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4425,7 +4426,7 @@ function peg$parse(input, options) {
   function peg$parseBoolean() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 45;
+    var key = peg$currPos * 63 + 45;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4471,7 +4472,7 @@ function peg$parse(input, options) {
   function peg$parseDuration() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12;
 
-    var key = peg$currPos * 62 + 46;
+    var key = peg$currPos * 63 + 46;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4668,7 +4669,7 @@ function peg$parse(input, options) {
   function peg$parseDurationNumber() {
     var s0, s1, s2, s3, s4, s5, s6;
 
-    var key = peg$currPos * 62 + 47;
+    var key = peg$currPos * 63 + 47;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4770,7 +4771,7 @@ function peg$parse(input, options) {
   function peg$parseText() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 48;
+    var key = peg$currPos * 63 + 48;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4812,7 +4813,7 @@ function peg$parse(input, options) {
   function peg$parseSign() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 49;
+    var key = peg$currPos * 63 + 49;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4864,7 +4865,7 @@ function peg$parse(input, options) {
   function peg$parseApostrophe() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 50;
+    var key = peg$currPos * 63 + 50;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -4904,7 +4905,7 @@ function peg$parse(input, options) {
   function peg$parseQuotedText() {
     var s0, s1, s2, s3, s4, s5;
 
-    var key = peg$currPos * 62 + 51;
+    var key = peg$currPos * 63 + 51;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5031,7 +5032,7 @@ function peg$parse(input, options) {
   function peg$parseParameterAlias() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 52;
+    var key = peg$currPos * 63 + 52;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5070,7 +5071,7 @@ function peg$parse(input, options) {
   function peg$parseNumberBind() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 53;
+    var key = peg$currPos * 63 + 53;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5092,10 +5093,35 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseUnsignedIntegerBind() {
+    var s0, s1;
+
+    var key = peg$currPos * 63 + 54;
+    var cached = peg$resultsCache[key];
+
+    if (cached) {
+      peg$currPos = cached.nextPos;
+
+      return cached.result;
+    }
+
+    s0 = peg$currPos;
+    s1 = peg$parseUnsignedInteger();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f89(s1);
+    }
+    s0 = s1;
+
+    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+
+    return s0;
+  }
+
   function peg$parseDate() {
     var s0, s1, s2, s3;
 
-    var key = peg$currPos * 62 + 54;
+    var key = peg$currPos * 63 + 55;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5115,7 +5141,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s1;
-      s2 = peg$f89();
+      s2 = peg$f90();
     }
     s1 = s2;
     if (s1 === peg$FAILED) {
@@ -5129,7 +5155,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s1;
-        s2 = peg$f90();
+        s2 = peg$f91();
       }
       s1 = s2;
     }
@@ -5138,12 +5164,12 @@ function peg$parse(input, options) {
       s3 = peg$parseQuotedText();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f91(s1, s3);
+        s3 = peg$f92(s1, s3);
       }
       s2 = s3;
       if (s2 !== peg$FAILED) {
         peg$savedPos = peg$currPos;
-        s3 = peg$f92(s1, s2);
+        s3 = peg$f93(s1, s2);
         if (s3) {
           s3 = peg$FAILED;
         } else {
@@ -5151,7 +5177,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f93(s1, s2);
+          s0 = peg$f94(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5173,7 +5199,7 @@ function peg$parse(input, options) {
   function peg$parseDateBind() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 55;
+    var key = peg$currPos * 63 + 56;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5186,7 +5212,7 @@ function peg$parse(input, options) {
     s1 = peg$parseDate();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
 
@@ -5198,7 +5224,7 @@ function peg$parse(input, options) {
   function peg$parseBooleanBind() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 56;
+    var key = peg$currPos * 63 + 57;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5211,7 +5237,7 @@ function peg$parse(input, options) {
     s1 = peg$parseBoolean();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95(s1);
+      s1 = peg$f96(s1);
     }
     s0 = s1;
 
@@ -5223,7 +5249,7 @@ function peg$parse(input, options) {
   function peg$parseContentReference() {
     var s0, s1, s2;
 
-    var key = peg$currPos * 62 + 57;
+    var key = peg$currPos * 63 + 58;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5244,7 +5270,7 @@ function peg$parse(input, options) {
       s2 = peg$parseResourceName();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f96(s2);
+        s0 = peg$f97(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5262,7 +5288,7 @@ function peg$parse(input, options) {
   function peg$parseQuotedTextBind() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 58;
+    var key = peg$currPos * 63 + 59;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5275,7 +5301,7 @@ function peg$parse(input, options) {
     s1 = peg$parseQuotedText();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f97(s1);
+      s1 = peg$f98(s1);
     }
     s0 = s1;
 
@@ -5287,7 +5313,7 @@ function peg$parse(input, options) {
   function peg$parseboundary() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 59;
+    var key = peg$currPos * 63 + 60;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5333,7 +5359,7 @@ function peg$parse(input, options) {
   function peg$parsespaces() {
     var s0, s1;
 
-    var key = peg$currPos * 62 + 60;
+    var key = peg$currPos * 63 + 61;
     var cached = peg$resultsCache[key];
 
     if (cached) {
@@ -5357,7 +5383,7 @@ function peg$parse(input, options) {
   function peg$parsespace() {
     var s0;
 
-    var key = peg$currPos * 62 + 61;
+    var key = peg$currPos * 63 + 62;
     var cached = peg$resultsCache[key];
 
     if (cached) {

package/odata-parser.pegjs

@@ -180,12 +180,12 @@ SortProperty =
 
 TopOption =
 	'top='
-	value:UnsignedInteger
+	value:UnsignedIntegerBind
 	{ return { name: '$top', value } }
 
 SkipOption =
 	'skip='
-	value:UnsignedInteger
+	value:UnsignedIntegerBind
 	{ return { name: '$skip', value } }
 
 InlineCountOption =
@@ -675,6 +675,10 @@ NumberBind =
 	n:Number
 	{ return Bind('Real', n) }
 
+UnsignedIntegerBind =
+	n:UnsignedInteger
+	{ return Bind('Integer', n) }
+
 Date =
 	type:(
 		'datetime'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -39,6 +39,6 @@
     "npm": ">=8.1.0"
   },
   "versionist": {
-    "publishedAt": "2024-06-03T15:30:15.468Z"
+    "publishedAt": "2024-10-03T19:30:42.294Z"
   }
 }

package/test/paging.js

@@ -2,14 +2,21 @@ import * as assert from 'assert';
 
 export default (test) => {
 	describe('Paging', function () {
-		test('$top=5&$skip=100', function (result) {
-			it('top should be specified', () => {
-				assert.equal(result.options.$top, 5);
-			});
-			it('skip should be specified', () => {
-				assert.equal(result.options.$skip, 100);
-			});
-		});
+		test(
+			'$top=5&$skip=100',
+			[
+				['Integer', 5],
+				['Integer', 100],
+			],
+			function (result) {
+				it('top should be specified', () => {
+					assert.deepEqual(result.options.$top, { bind: 0 });
+				});
+				it('skip should be specified', () => {
+					assert.deepEqual(result.options.$skip, { bind: 1 });
+				});
+			},
+		);
 
 		test('$inlinecount=allpages', (result) => {
 			it('inline should be specified', () => {