@balena/odata-parser 4.2.2 → 4.2.3

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Avoid setting $count `options` for $orderby when not provided
+      hash: 4e1f9750aed95dba4731d1fe9e7a46a000ea4ab6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+  version: 4.2.3
+  title: ""
+  date: 2025-04-01T07:49:35.337Z
 - commits:
     - subject: Update dependency mocha to v11
       hash: 118d83467fc89b977ad89f7b9444897739399693
@@ -9,7 +20,7 @@
       author: balena-renovate[bot]
   version: 4.2.2
   title: ""
-  date: 2025-03-18T11:47:06.799Z
+  date: 2025-03-25T16:34:08.496Z
 - commits:
     - subject: Add the missing MethodCall type
       hash: 78efcd852c6ff653da7eb17c9d15cdfaf18f177e

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/).
 
+# v4.2.3
+## (2025-04-01)
+
+* Avoid setting $count `options` for $orderby when not provided [Thodoris Greasidis]
+
 # v4.2.2
-## (2025-03-18)
+## (2025-03-25)
 
 * Update dependency mocha to v11 [balena-renovate[bot]]
 

package/odata-parser.js

@@ -568,8 +568,8 @@ function peg$parse(input, options) {
   var peg$f42 = function(methodName, args) { return [ 'call', { args, method: methodName } ] };
   var peg$f43 = function(name) { return { name } };
   var peg$f44 = function(result, property) { result.property = property };
-  var peg$f45 = function(result, option) { return CollapseObjectArray([option]) };
-  var peg$f46 = function(result, optionsObj) { result.count = true; result.options = optionsObj };
+  var peg$f45 = function(result, option) { result.options = CollapseObjectArray([option]) };
+  var peg$f46 = function(result) { result.count = true };
   var peg$f47 = function(result, key) { result.key = key };
   var peg$f48 = function(result, property) { result.property = property };
   var peg$f49 = function(result) { return result };
@@ -3381,7 +3381,8 @@ function peg$parse(input, options) {
                 if (peg$silentFails === 0) { peg$fail(peg$e35); }
               }
               if (s7 !== peg$FAILED) {
-                s4 = s6;
+                s5 = [s5, s6, s7];
+                s4 = s5;
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -3398,7 +3399,7 @@ function peg$parse(input, options) {
             s4 = null;
           }
           peg$savedPos = s2;
-          s2 = peg$f46(s1, s4);
+          s2 = peg$f46(s1);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;

package/odata-parser.pegjs

@@ -450,15 +450,15 @@ PropertyPath =
 	/	( // collectionNavigationExpr
 			( // collectionPathExpr
 				'/$count'
-				optionsObj:(
+				(
 					'('
-					@(	Dollar
+					(	Dollar
 						option:FilterByOption
-						{ return CollapseObjectArray([option]) }
+						{ result.options = CollapseObjectArray([option]) }
 					)
 					')'
 				)?
-				{ result.count = true; result.options = optionsObj }
+				{ result.count = true }
 			)
 		/	( // keyPredicate [ singleNavigationExpr ]
 				(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -39,6 +39,6 @@
     "npm": ">=8.1.0"
   },
   "versionist": {
-    "publishedAt": "2025-03-18T11:47:06.942Z"
+    "publishedAt": "2025-04-01T07:49:35.456Z"
   }
 }

package/test/orderby.js

@@ -1,4 +1,5 @@
 import * as assert from 'assert';
+import { expect } from 'chai';
 import filterby from './filterby';
 
 export default (test) => {
@@ -103,6 +104,20 @@ export default (test) => {
 			it('has count defined', () => {
 				assert.equal(result.options.$orderby.properties[0].count, true);
 			});
+			it('has no count options defined', () => {
+				expect(result.options.$orderby.properties[0]).to.not.have.property(
+					'options',
+				);
+			});
+			it('sort options property should be as expected', () => {
+				assert.deepStrictEqual(result.options.$orderby.properties, [
+					{
+						name: 'PropertyOne',
+						count: true,
+						order: 'desc',
+					},
+				]);
+			});
 		});
 
 		const testFilterOption = function (nestedTest, input, ...optArgs) {
@@ -231,7 +246,7 @@ export default (test) => {
 					{
 						name: 'Products',
 						key: { bind: 0 },
-						property: { name: 'Orders', count: true, options: null },
+						property: { name: 'Orders', count: true },
 						order: 'asc',
 					},
 				]);
@@ -255,7 +270,7 @@ export default (test) => {
 							key: {
 								partialkey: { bind: 0 },
 							},
-							property: { name: 'Orders', count: true, options: null },
+							property: { name: 'Orders', count: true },
 							order: 'asc',
 						},
 					]);