@balena/odata-parser 3.1.0 → 3.1.1

package/odata-parser.pegjs

@@ -420,12 +420,16 @@ ResourceMethodCall =
 PropertyPathList =
 	PropertyPath|1..,','|
 PropertyPath =
-	resource:ResourceName
-	property:(
+	result:(
+		name:ResourceName
+		{ return { name } }
+	)
+	(
 		'/'
-		@PropertyPath
+		property:PropertyPath
+		{ result.property = property }
 	)?
-	countOptions:(
+	(
 		'/$count'
 		optionsObj:(
 			'('
@@ -435,30 +439,35 @@ PropertyPath =
 			)
 			')'
 		)?
-		{ return { count: true, options: optionsObj } }
+		{ result.count = true; result.options = optionsObj }
 	)?
-	{ return { name: resource, property, ...countOptions } }
+	{ return result }
 ExpandPropertyPathList =
 	ExpandPropertyPath|1..,','|
 ExpandPropertyPath =
-	resource:ResourceName
-	count:(
+	result:(
+		name:ResourceName
+		{ return { name } }
+	)
+	(
 		'/$count'
-		{ return true }
+		{ result.count = true }
 	)?
-	optionsObj:(
+	(
 		'('
-		@(	options:QueryOption|1..,[&;]|
-			{ return CollapseObjectArray(options) }
-		/ '' { return {} }
+		(
+			options:QueryOption|1..,[&;]|
+			{ result.options =  CollapseObjectArray(options) }
+		/ ''
 		)
 		')'
 	)?
-	next:(
+	(
 		'/'
-		@PropertyPath
+		next:PropertyPath
+		{ result.property = next }
 	)?
-	{ return { name: resource, property: next, count, options: optionsObj} }
+	{ return result }
 
 LambdaPropertyPath =
 	resource:ResourceName

package/package.json

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

package/test/expand.js

@@ -1,4 +1,5 @@
 import * as assert from 'assert';
+import { expect } from 'chai';
 import $test from './test';
 import filterby from './filterby';
 import format from './format';
@@ -23,18 +24,43 @@ const testExpands = function (test, nested = 1) {
 					'Suppliers',
 				);
 			});
+			it('should not have a nested property on Suppliers', () => {
+				expect(
+					result.options.$expand.properties[0].property,
+				).to.not.have.property('property');
+			});
 		});
 
-		test('$expand=Products,Suppliers', function (result) {
+		test('$expand=Products,Suppliers()', function (result) {
 			it('has an $expand value', () => {
 				assert.notEqual(result.options.$expand, null);
 			});
 			it('has a resource of Products', () => {
 				assert.equal(result.options.$expand.properties[0].name, 'Products');
 			});
+			it('not have count set on Products', () => {
+				expect(result.options.$expand.properties[0]).to.not.have.property(
+					'count',
+				);
+			});
+			it('not have options set on Products', () => {
+				expect(result.options.$expand.properties[0]).to.not.have.property(
+					'options',
+				);
+			});
+			it('should not have a nested property on Products', () => {
+				expect(result.options.$expand.properties[0]).to.not.have.property(
+					'property',
+				);
+			});
 			it('has a resource of Suppliers', () => {
 				assert.equal(result.options.$expand.properties[1].name, 'Suppliers');
 			});
+			it('not have options set on Suppliers', () => {
+				expect(result.options.$expand.properties[1]).to.not.have.property(
+					'options',
+				);
+			});
 		});
 
 		test('$expand=Products/$count', function (result) {

package/test/resource_parsing.js

@@ -282,6 +282,10 @@ describe('Resource Parsing', function () {
 			assert.equal(result.options.$filter[1].name, 'id');
 		});
 
+		it('lhr should not have a property', () => {
+			expect(result.options.$filter[1]).to.not.have.property('property');
+		});
+
 		it('rhr should be $0', () => {
 			assert.equal(result.options.$filter[2].bind, 0);
 		});