@balena/odata-parser 2.2.9 → 2.3.0

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Add source map
+      hash: a6bb5e67fac1cdcc69491800ad042f003fa13556
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Pagan Gazzard
+  version: 2.3.0
+  title: "'Add source map'"
+  date: 2022-06-06T16:33:40.752Z
 - commits:
     - subject: Update dependencies
       hash: e63884d3e86c2654fd601cacc53f3e8e61bb1d87
@@ -15,7 +26,7 @@
       author: Pagan Gazzard
   version: 2.2.9
   title: "'Remove circleci/update deps'"
-  date: 2022-04-08T13:17:42.408Z
+  date: 2022-04-08T13:13:27.932Z
 - commits:
     - subject: Remove some typescript strict mode exceptions
       hash: 639771285e9aaae52bff21ff38eda5f921101a63

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.3.0
+## (2022-06-06)
+
+* Add source map [Pagan Gazzard]
+
 # v2.2.9
 ## (2022-04-08)
 

package/odata-parser.js

@@ -1,4 +1,4 @@
-// Generated by Peggy 1.2.0.
+// Generated by Peggy 2.0.1.
 //
 // https://peggyjs.org/
 
@@ -12,6 +12,7 @@ function peg$subclass(child, parent) {
 
 function peg$SyntaxError(message, expected, found, location) {
   var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
   if (Object.setPrototypeOf) {
     Object.setPrototypeOf(self, peg$SyntaxError.prototype);
   }
@@ -47,14 +48,15 @@ peg$SyntaxError.prototype.format = function(sources) {
     var loc = this.location.source + ":" + s.line + ":" + s.column;
     if (src) {
       var e = this.location.end;
-      var filler = peg$padEnd("", s.line.toString().length);
+      var filler = peg$padEnd("", s.line.toString().length, ' ');
       var line = src[s.line - 1];
       var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
       str += "\n --> " + loc + "\n"
           + filler + " |\n"
           + s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1)
-          + peg$padEnd("", last - s.column, "^");
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
     } else {
       str += "\n at " + loc;
     }
@@ -75,7 +77,7 @@ peg$SyntaxError.buildMessage = function(expected, found) {
           : classEscape(part);
       });
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
     },
 
     any: function() {
@@ -395,13 +397,13 @@ function peg$parse(input, options) {
   var peg$f0 = function() {reset(); return true;};
   var peg$f1 = function(tree) { return { tree: tree, binds: binds } };
   var peg$f2 = function() {
-  		reset();
-  		var tree = eval(`peg$parse${options.rule}()`);
-  		return {
-  			tree,
-  			binds
-  		}
-  	};
+		reset();
+		var tree = eval(`peg$parse${options.rule}()`);
+		return {
+			tree,
+			binds
+		}
+	};
   var peg$f3 = function(model) { return model };
   var peg$f4 = function() { return { resource: '$metadata' } };
   var peg$f5 = function() { return { resource: '$serviceroot' } };
@@ -411,19 +413,19 @@ function peg$parse(input, options) {
   var peg$f9 = function(name, s) { return [ 'Text', s ] };
   var peg$f10 = function(name, value) { return !binds['@' + name] };
   var peg$f11 = function(name, value) {
-  		binds['@' + name] = value
-  		return {
-  			name: '@' + name,
-  			value: value
-  		}
-  	};
+		binds['@' + name] = value
+		return {
+			name: '@' + name,
+			value: value
+		}
+	};
   var peg$f12 = function(name, value) { return { name: name, value: value } };
   var peg$f13 = function(property, properties) { return { name: '$orderby', value: { properties: [property, ...properties] } } };
   var peg$f14 = function(property) { return 'desc' };
   var peg$f15 = function(property, order) {
-  		property.order = order;
-  		return property
-  	};
+		property.order = order;
+		return property
+	};
   var peg$f16 = function(value) { return { name: '$top', value: value } };
   var peg$f17 = function(value) { return { name: '$skip', value: value } };
   var peg$f18 = function() { return '' };
@@ -436,97 +438,111 @@ function peg$parse(input, options) {
   var peg$f25 = function(type, metadata) { return { name: '$format', value: { type, metadata } } };
   var peg$f26 = function(type) { return { name: '$format', value: type } };
   var peg$f27 = function() {
-  		precedence = 0;
-  	};
+		precedence = 0;
+	};
   var peg$f28 = function() {
-  			return precedence;
-  		};
+			return precedence;
+		};
   var peg$f29 = function(minPrecedence, x) { return [x] };
   var peg$f30 = function(minPrecedence, lhs, op) {
-  				precedence = operatorPrecedence[op] + 1
-  				return precedence > minPrecedence
-  			};
+				precedence = operatorPrecedence[op] + 1
+				return precedence > minPrecedence
+			};
   var peg$f31 = function(minPrecedence, lhs, op, rhs) {
-  				if (Array.isArray(lhs[0]) && op === lhs[0][0]) {
-  					lhs[0].push(rhs);
-  				} else {
-  					lhs[0] = [ op, lhs[0], rhs ];
-  				}
-  			};
+				if (Array.isArray(lhs[0]) && op === lhs[0][0]) {
+					lhs[0].push(rhs);
+				} else {
+					lhs[0] = [ op, lhs[0], rhs ];
+				}
+			};
   var peg$f32 = function(minPrecedence, lhs, op, rhs) {lhs[0] = [ op, lhs[0], rhs ]};
   var peg$f33 = function(minPrecedence, lhs) { return lhs[0] };
   var peg$f34 = function(minPrecedence) {return minPrecedence > 0};
   var peg$f35 = function(minPrecedence) {
-  			precedence = 0;
-  			return peg$parseFilterByExpressionLoop()
-  		};
+			precedence = 0;
+			return peg$parseFilterByExpressionLoop()
+		};
   var peg$f36 = function(first, rest) { return [ first, ...rest ] };
   var peg$f37 = function(methodName, first, rest) { return [ first, ...rest ] };
   var peg$f38 = function(methodName) { return [] };
   var peg$f39 = function(methodName, args) { return args.length === methods[methodName] || (Array.isArray(methods[methodName]) && methods[methodName].includes(args.length)) };
   var peg$f40 = function(methodName, args) { return [ 'call', { args: args, method: methodName } ] };
   var peg$f41 = function(name, identifier, expression) { return { expression: expression, identifier: identifier, method: name } };
-  var peg$f42 = function(path, paths) { return [path, ...paths] };
-  var peg$f43 = function(resource, property) { return true };
-  var peg$f44 = function(resource, property, count) { return { name: resource, property, count } };
-  var peg$f45 = function(resource) { return true };
-  var peg$f46 = function(resource, count, option, options) { return CollapseObjectArray([option, ...options]) };
-  var peg$f47 = function(resource, count) { return {} };
-  var peg$f48 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count: count, options: optionsObj} };
-  var peg$f49 = function(resource, next) { return { name: resource, property: next } };
-  var peg$f50 = function(resource, lambda) { return { name: resource, lambda: lambda } };
-  var peg$f51 = function(resource, method) { return { name: resource, method: method } };
-  var peg$f52 = function(keyBind, keyBinds) { return CollapseObjectArray([keyBind, ...keyBinds]) };
-  var peg$f53 = function(name, value) { return { name, value }};
-  var peg$f54 = function(resource) { return { resource } };
-  var peg$f55 = function(result, key) { result.key = key };
-  var peg$f56 = function(result, link) {result.link = link};
-  var peg$f57 = function(result, property) {result.property = property};
-  var peg$f58 = function(result) {result.count = true};
-  var peg$f59 = function(result) { return result };
-  var peg$f60 = function(result, options) {result.options = options};
-  var peg$f61 = function(resourceName) { return decodeURIComponent(resourceName) };
-  var peg$f62 = function(sign, d) { return Number(sign + d) };
-  var peg$f63 = function(d) { return parseInt(d, 10) };
-  var peg$f64 = function() { return null };
-  var peg$f65 = function() { return true };
-  var peg$f66 = function() { return false };
-  var peg$f67 = function(sign, day, hour, minute, second) {return hour || minute || second};
-  var peg$f68 = function(sign, day, hour, minute, second) {
-  			return {
-  				hour: hour || undefined,
-  				minute: minute || undefined,
-  				second: second || undefined
-  			}
-  		};
-  var peg$f69 = function(sign, day, time) {return day || time};
-  var peg$f70 = 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$f71 = function(d) { return Number(d) };
-  var peg$f72 = function(text) { return decodeURIComponent(text) };
-  var peg$f73 = function() { return '+' };
-  var peg$f74 = function() { return '\'' };
-  var peg$f75 = function(text) { return decodeURIComponent(text.join('')) };
-  var peg$f76 = function(param) { return { bind: '@' + param } };
-  var peg$f77 = function(n) { return Bind('Real', n) };
-  var peg$f78 = function() { return 'Date Time' };
-  var peg$f79 = function() { return 'Date' };
-  var peg$f80 = function(type, date) { return Date.parse(date) };
-  var peg$f81 = function(type, date) { return isNaN(date) };
-  var peg$f82 = function(type, date) { return [type, date] };
-  var peg$f83 = function(d) { return Bind(d[0], d[1]) };
-  var peg$f84 = function(b) { return Bind('Boolean', b) };
-  var peg$f85 = function(resource) {
-  		var bind = Bind('ContentReference', resource)
-  		return { resource: bind, key: bind }
-  	};
-  var peg$f86 = function(t) { return Bind('Text', t) };
-
+  var peg$f42 = function(methodName, first, rest) { return [ first, ...rest ] };
+  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) {
+			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 {
+		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 bind = Bind('ContentReference', resource)
+		return { resource: bind, key: bind }
+	};
+  var peg$f101 = function(t) { return Bind('Text', t) };
   var peg$currPos = 0;
   var peg$savedPos = 0;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -3126,7 +3142,7 @@ function peg$parse(input, options) {
           }
           s7 = peg$parsespaces();
           peg$savedPos = s4;
-          s4 = peg$f37(s1, s5, s6);
+          s4 = peg$f42(s1, s5, s6);
         } else {
           peg$currPos = s4;
           s4 = peg$FAILED;
@@ -3135,7 +3151,7 @@ function peg$parse(input, options) {
           s4 = peg$currPos;
           s5 = '';
           peg$savedPos = s4;
-          s5 = peg$f38(s1);
+          s5 = peg$f43(s1);
           s4 = s5;
         }
         if (s4 !== peg$FAILED) {
@@ -3148,7 +3164,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f40(s1, s4);
+            s0 = peg$f44(s1, s4);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -3231,7 +3247,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f42(s1, s2);
+      s0 = peg$f45(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3290,14 +3306,14 @@ function peg$parse(input, options) {
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s3;
-        s4 = peg$f43(s1, s2);
+        s4 = peg$f46(s1, s2);
       }
       s3 = s4;
       if (s3 === peg$FAILED) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f44(s1, s2, s3);
+      s0 = peg$f47(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3368,7 +3384,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f42(s1, s2);
+      s0 = peg$f48(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3404,7 +3420,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f45(s1);
+        s3 = peg$f49(s1);
       }
       s2 = s3;
       if (s2 === peg$FAILED) {
@@ -3467,7 +3483,7 @@ function peg$parse(input, options) {
             }
           }
           peg$savedPos = s5;
-          s5 = peg$f46(s1, s2, s6, s7);
+          s5 = peg$f50(s1, s2, s6, s7);
         } else {
           peg$currPos = s5;
           s5 = peg$FAILED;
@@ -3476,7 +3492,7 @@ function peg$parse(input, options) {
           s5 = peg$currPos;
           s6 = '';
           peg$savedPos = s5;
-          s6 = peg$f47(s1, s2);
+          s6 = peg$f51(s1, s2);
           s5 = s6;
         }
         if (s5 !== peg$FAILED) {
@@ -3528,7 +3544,7 @@ function peg$parse(input, options) {
         s4 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f48(s1, s2, s3, s4);
+      s0 = peg$f52(s1, s2, s3, s4);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3566,7 +3582,7 @@ function peg$parse(input, options) {
         s4 = peg$parseLambdaPropertyPath();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f49(s1, s4);
+          s4 = peg$f53(s1, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -3574,7 +3590,7 @@ function peg$parse(input, options) {
           s4 = peg$parseLambdaMethodCall();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s3;
-            s4 = peg$f50(s1, s4);
+            s4 = peg$f54(s1, s4);
           }
           s3 = s4;
           if (s3 === peg$FAILED) {
@@ -3582,7 +3598,7 @@ function peg$parse(input, options) {
             s4 = peg$parseResourceMethodCall();
             if (s4 !== peg$FAILED) {
               peg$savedPos = s3;
-              s4 = peg$f51(s1, s4);
+              s4 = peg$f55(s1, s4);
             }
             s3 = s4;
           }
@@ -3678,7 +3694,7 @@ function peg$parse(input, options) {
             }
           }
           peg$savedPos = s2;
-          s2 = peg$f52(s3, s4);
+          s2 = peg$f56(s3, s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -3738,7 +3754,7 @@ function peg$parse(input, options) {
         s3 = peg$parseKeyBind();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f53(s1, s3);
+          s0 = peg$f57(s1, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3846,7 +3862,7 @@ function peg$parse(input, options) {
       s4 = peg$parseResourceName();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s3;
-        s4 = peg$f54(s4);
+        s4 = peg$f58(s4);
       }
       s3 = s4;
       if (s3 !== peg$FAILED) {
@@ -3855,7 +3871,7 @@ function peg$parse(input, options) {
         s6 = peg$parseKey();
         if (s6 !== peg$FAILED) {
           peg$savedPos = s5;
-          s6 = peg$f55(s3, s6);
+          s6 = peg$f59(s3, s6);
         }
         s5 = s6;
         if (s5 !== peg$FAILED) {
@@ -3863,7 +3879,7 @@ function peg$parse(input, options) {
           s7 = peg$parseLinks();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s6;
-            s7 = peg$f56(s3, s7);
+            s7 = peg$f60(s3, s7);
           }
           s6 = s7;
           if (s6 === peg$FAILED) {
@@ -3871,7 +3887,7 @@ function peg$parse(input, options) {
             s7 = peg$parseSubPathSegment();
             if (s7 !== peg$FAILED) {
               peg$savedPos = s6;
-              s7 = peg$f57(s3, s7);
+              s7 = peg$f61(s3, s7);
             }
             s6 = s7;
           }
@@ -3895,7 +3911,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             peg$savedPos = s4;
-            s5 = peg$f58(s3);
+            s5 = peg$f62(s3);
           }
           s4 = s5;
         }
@@ -3903,7 +3919,7 @@ function peg$parse(input, options) {
           s4 = null;
         }
         peg$savedPos = s1;
-        s1 = peg$f59(s3);
+        s1 = peg$f63(s3);
       } else {
         peg$currPos = s1;
         s1 = peg$FAILED;
@@ -3920,7 +3936,7 @@ function peg$parse(input, options) {
         s4 = peg$parseLinks();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f56(s2, s4);
+          s4 = peg$f64(s2, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -3928,7 +3944,7 @@ function peg$parse(input, options) {
           s4 = peg$parseSubPathSegment();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s3;
-            s4 = peg$f57(s2, s4);
+            s4 = peg$f65(s2, s4);
           }
           s3 = s4;
         }
@@ -3936,7 +3952,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s1;
-        s1 = peg$f59(s2);
+        s1 = peg$f66(s2);
       } else {
         peg$currPos = s1;
         s1 = peg$FAILED;
@@ -3956,7 +3972,7 @@ function peg$parse(input, options) {
         s5 = peg$parseQueryOptions();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s4;
-          s5 = peg$f60(s1, s5);
+          s5 = peg$f67(s1, s5);
         }
         s4 = s5;
         if (s4 === peg$FAILED) {
@@ -3972,7 +3988,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f59(s1);
+      s0 = peg$f68(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4008,7 +4024,7 @@ function peg$parse(input, options) {
       s3 = peg$parseResourceName();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f54(s3);
+        s3 = peg$f69(s3);
       }
       s2 = s3;
       if (s2 !== peg$FAILED) {
@@ -4016,7 +4032,7 @@ function peg$parse(input, options) {
         s4 = peg$parseKey();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s3;
-          s4 = peg$f55(s2, s4);
+          s4 = peg$f70(s2, s4);
         }
         s3 = s4;
         if (s3 === peg$FAILED) {
@@ -4034,7 +4050,7 @@ function peg$parse(input, options) {
           s6 = peg$parseSubPathSegment();
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f56(s2, s6);
+            s4 = peg$f71(s2, s6);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4048,7 +4064,7 @@ function peg$parse(input, options) {
           s5 = peg$parseSubPathSegment();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s4;
-            s5 = peg$f57(s2, s5);
+            s5 = peg$f72(s2, s5);
           }
           s4 = s5;
         }
@@ -4065,7 +4081,7 @@ function peg$parse(input, options) {
         }
         if (s6 !== peg$FAILED) {
           peg$savedPos = s5;
-          s6 = peg$f58(s2);
+          s6 = peg$f73(s2);
         }
         s5 = s6;
         if (s5 === peg$FAILED) {
@@ -4084,7 +4100,7 @@ function peg$parse(input, options) {
           s9 = peg$parseQueryOptions();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s8;
-            s9 = peg$f60(s2, s9);
+            s9 = peg$f74(s2, s9);
           }
           s8 = s9;
           if (s8 === peg$FAILED) {
@@ -4100,7 +4116,7 @@ function peg$parse(input, options) {
           s6 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f59(s2);
+        s0 = peg$f75(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4158,7 +4174,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f61(s1);
+      s1 = peg$f76(s1);
     }
     s0 = s1;
 
@@ -4265,7 +4281,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f62(s1, s2);
+        s0 = peg$f77(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4323,7 +4339,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f63(s1);
+      s1 = peg$f78(s1);
     }
     s0 = s1;
 
@@ -4354,7 +4370,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f64();
+      s1 = peg$f79();
     }
     s0 = s1;
 
@@ -4385,7 +4401,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f65();
+      s1 = peg$f80();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -4399,7 +4415,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f66();
+        s1 = peg$f81();
       }
       s0 = s1;
     }
@@ -4544,7 +4560,7 @@ function peg$parse(input, options) {
                 s10 = null;
               }
               peg$savedPos = peg$currPos;
-              s11 = peg$f67(s3, s5, s8, s9, s10);
+              s11 = peg$f82(s3, s5, s8, s9, s10);
               if (s11) {
                 s11 = undefined;
               } else {
@@ -4552,7 +4568,7 @@ function peg$parse(input, options) {
               }
               if (s11 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f68(s3, s5, s8, s9, s10);
+                s6 = peg$f83(s3, s5, s8, s9, s10);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -4565,7 +4581,7 @@ function peg$parse(input, options) {
               s6 = null;
             }
             peg$savedPos = peg$currPos;
-            s7 = peg$f69(s3, s5, s6);
+            s7 = peg$f84(s3, s5, s6);
             if (s7) {
               s7 = undefined;
             } else {
@@ -4575,7 +4591,7 @@ function peg$parse(input, options) {
               s8 = peg$parseApostrophe();
               if (s8 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f70(s3, s5, s6);
+                s0 = peg$f85(s3, s5, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -4696,7 +4712,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f71(s1);
+      s1 = peg$f86(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -4742,7 +4758,7 @@ function peg$parse(input, options) {
     }
     s1 = input.substring(s1, peg$currPos);
     peg$savedPos = s0;
-    s1 = peg$f72(s1);
+    s1 = peg$f87(s1);
     s0 = s1;
 
     peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
@@ -4780,7 +4796,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f73();
+        s1 = peg$f88();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -4832,7 +4848,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f74();
+        s1 = peg$f89();
       }
       s0 = s1;
     }
@@ -4954,7 +4970,7 @@ function peg$parse(input, options) {
       s3 = peg$parseApostrophe();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75(s2);
+        s0 = peg$f90(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4993,7 +5009,7 @@ function peg$parse(input, options) {
       s2 = peg$parseResourceName();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f76(s2);
+        s0 = peg$f91(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5024,7 +5040,7 @@ function peg$parse(input, options) {
     s1 = peg$parseNumber();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f77(s1);
+      s1 = peg$f92(s1);
     }
     s0 = s1;
 
@@ -5056,7 +5072,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s1;
-      s2 = peg$f78();
+      s2 = peg$f93();
     }
     s1 = s2;
     if (s1 === peg$FAILED) {
@@ -5070,7 +5086,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s1;
-        s2 = peg$f79();
+        s2 = peg$f94();
       }
       s1 = s2;
     }
@@ -5079,12 +5095,12 @@ function peg$parse(input, options) {
       s3 = peg$parseQuotedText();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s2;
-        s3 = peg$f80(s1, s3);
+        s3 = peg$f95(s1, s3);
       }
       s2 = s3;
       if (s2 !== peg$FAILED) {
         peg$savedPos = peg$currPos;
-        s3 = peg$f81(s1, s2);
+        s3 = peg$f96(s1, s2);
         if (s3) {
           s3 = peg$FAILED;
         } else {
@@ -5092,7 +5108,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f82(s1, s2);
+          s0 = peg$f97(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5127,7 +5143,7 @@ function peg$parse(input, options) {
     s1 = peg$parseDate();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f83(s1);
+      s1 = peg$f98(s1);
     }
     s0 = s1;
 
@@ -5152,7 +5168,7 @@ function peg$parse(input, options) {
     s1 = peg$parseBoolean();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f84(s1);
+      s1 = peg$f99(s1);
     }
     s0 = s1;
 
@@ -5185,7 +5201,7 @@ function peg$parse(input, options) {
       s2 = peg$parseResourceName();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f85(s2);
+        s0 = peg$f100(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5216,7 +5232,7 @@ function peg$parse(input, options) {
     s1 = peg$parseQuotedText();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f86(s1);
+      s1 = peg$f101(s1);
     }
     s0 = s1;
 
@@ -5339,93 +5355,92 @@ function peg$parse(input, options) {
   }
 
 
-  	var methods = {
-  		cast: [ 1, 2 ],
-  		ceiling: 1,
-  		concat: 2,
-  		contains: 2,
-  		date: 1,
-  		day: 1,
-  		endswith: 2,
-  		floor: 1,
-  		fractionalseconds: 1,
-  		hour: 1,
-  		indexof: 2,
-  		isof: [ 1, 2 ],
-  		length: 1,
-  		maxdatetime: 0,
-  		mindatetime: 0,
-  		minute: 1,
-  		month: 1,
-  		now: 0,
-  		replace: 3,
-  		round: 1,
-  		second: 1,
-  		startswith: 2,
-  		substringof: 2,
-  		substring: [ 2, 3 ],
-  		time: 1,
-  		tolower: 1,
-  		totaloffsetminutes: 1,
-  		totalseconds: 1,
-  		toupper: 1,
-  		trim: 1,
-  		year: 1
-  	};
-
-  	var operatorPrecedence = {
-  		or: 0,
-  		and: 0,
-  		eq: 1,
-  		ne: 1,
-  		gt: 1,
-  		ge: 1,
-  		lt: 1,
-  		le: 1,
-  		sub: 2,
-  		add: 3,
-  		mod: 4,
-  		div: 5,
-  		mul: 6
-  	};
-
-  	// v4 operator precedence
-  	// var operatorPrecedence = {
-  	// 	or: 0,
-  	// 	and: 1,
-  	// 	eq: 2,
-  	// 	ne: 2,
-  	// 	gt: 3,
-  	// 	ge: 3,
-  	// 	lt: 3,
-  	// 	le: 3,
-  	// 	add: 4,
-  	// 	sub: 4,
-  	// 	mul: 5,
-  	// 	div: 5,
-  	// 	mod: 5
-  	// };
-
-  	var binds = [];
-  	var precedence = 0;
-  	function reset() {
-  		binds = [];
-  		precedence = 0;
-  	};
-
-  	function CollapseObjectArray(options) {
-  		var optionsObj = {};
-  		for(var i in options) {
-  			optionsObj[options[i].name] = options[i].value;
-  		}
-  		return optionsObj;
-  	};
-
-  	function Bind(type, value) {
-  		binds.push([type, value])
-  		return { bind: binds.length - 1 }
-  	}
-
+	var methods = {
+		cast: [ 1, 2 ],
+		ceiling: 1,
+		concat: 2,
+		contains: 2,
+		date: 1,
+		day: 1,
+		endswith: 2,
+		floor: 1,
+		fractionalseconds: 1,
+		hour: 1,
+		indexof: 2,
+		isof: [ 1, 2 ],
+		length: 1,
+		maxdatetime: 0,
+		mindatetime: 0,
+		minute: 1,
+		month: 1,
+		now: 0,
+		replace: 3,
+		round: 1,
+		second: 1,
+		startswith: 2,
+		substringof: 2,
+		substring: [ 2, 3 ],
+		time: 1,
+		tolower: 1,
+		totaloffsetminutes: 1,
+		totalseconds: 1,
+		toupper: 1,
+		trim: 1,
+		year: 1
+	};
+
+	var operatorPrecedence = {
+		or: 0,
+		and: 0,
+		eq: 1,
+		ne: 1,
+		gt: 1,
+		ge: 1,
+		lt: 1,
+		le: 1,
+		sub: 2,
+		add: 3,
+		mod: 4,
+		div: 5,
+		mul: 6
+	};
+
+	// v4 operator precedence
+	// var operatorPrecedence = {
+	// 	or: 0,
+	// 	and: 1,
+	// 	eq: 2,
+	// 	ne: 2,
+	// 	gt: 3,
+	// 	ge: 3,
+	// 	lt: 3,
+	// 	le: 3,
+	// 	add: 4,
+	// 	sub: 4,
+	// 	mul: 5,
+	// 	div: 5,
+	// 	mod: 5
+	// };
+
+	var binds = [];
+	var precedence = 0;
+	function reset() {
+		binds = [];
+		precedence = 0;
+	};
+
+	function CollapseObjectArray(options) {
+		var optionsObj = {};
+		for(var i in options) {
+			optionsObj[options[i].name] = options[i].value;
+		}
+		return optionsObj;
+	};
+
+	function Bind(type, value) {
+		binds.push([type, value])
+		return { bind: binds.length - 1 }
+	}
 
   peg$result = peg$startRuleFunction();
 
@@ -5450,3 +5465,4 @@ module.exports = {
   SyntaxError: peg$SyntaxError,
   parse: peg$parse
 };
+//# sourceMappingURL=odata-parser.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "2.2.9",
+  "version": "2.3.0",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "test": "mocha",
     "posttest": "npm run lint",
     "prepublish": "require-npm4-to-publish",
-    "prepare": "peggy --extra-options-file odata-parser.config.json --output odata-parser.js odata-parser.pegjs",
+    "prepare": "peggy --source-map --extra-options-file odata-parser.config.json --output odata-parser.js odata-parser.pegjs",
     "prettify": "balena-lint -e ts -e js --typescript --fix odata-parser.d.ts test"
   },
   "repository": "https://github.com/balena-io-modules/odata-parser.git",
@@ -17,18 +17,18 @@
   "license": "BSD",
   "devDependencies": {
     "@balena/lint": "^6.2.0",
-    "@types/chai": "^4.3.0",
-    "@types/lodash": "^4.14.181",
-    "@types/mocha": "^9.1.0",
+    "@types/chai": "^4.3.1",
+    "@types/lodash": "^4.14.182",
+    "@types/mocha": "^9.1.1",
     "chai": "^4.3.6",
     "husky": "^4.3.8",
-    "lint-staged": "^12.3.7",
+    "lint-staged": "^12.5.0",
     "lodash": "^4.17.21",
     "mocha": "^9.2.2",
-    "peggy": "^1.2.0",
+    "peggy": "^2.0.1",
     "require-npm4-to-publish": "^1.0.0",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.3"
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.3"
   },
   "husky": {
     "hooks": {
@@ -42,6 +42,6 @@
     "_": "test/run.js"
   },
   "versionist": {
-    "publishedAt": "2022-04-08T13:17:42.546Z"
+    "publishedAt": "2022-06-06T16:33:40.852Z"
   }
 }