@balena/odata-parser 4.2.8 → 4.2.9

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Replace `CollapseObjectArray` with `Object.fromEntries`
+      hash: cff575f1888896b9278adda63988df3922aae6c7
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+  version: 4.2.9
+  title: ""
+  date: 2025-10-16T13:59:19.198Z
 - commits:
     - subject: Update dependency lint-staged to v16
       hash: 1ad6c3e66d76d9fba07440f75e719f210505f9d9
@@ -9,7 +20,7 @@
       author: balena-renovate[bot]
   version: 4.2.8
   title: ""
-  date: 2025-09-11T12:17:01.514Z
+  date: 2025-09-11T12:20:28.065Z
 - commits:
     - subject: Update dependency peggy to v5
       hash: a3bd65a4f4a63999b58a5076563e0eaa51a755d3

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/).
 
+# v4.2.9
+## (2025-10-16)
+
+* Replace `CollapseObjectArray` with `Object.fromEntries` [Pagan Gazzard]
+
 # v4.2.8
 ## (2025-09-11)
 

package/odata-parser.js

@@ -72,14 +72,6 @@
 	// 	mod: 5
 	// };
 
-	function CollapseObjectArray(options) {
-		const optionsObj = {};
-		for(const i in options) {
-			optionsObj[options[i].name] = options[i].value;
-		}
-		return optionsObj;
-	};
-
 class peg$SyntaxError extends SyntaxError {
   constructor(message, expected, found, location) {
     super(message);
@@ -476,36 +468,33 @@ function peg$parse(input, options) {
   function peg$f3(model) {    return model  }
   function peg$f4() {    return { resource: '$metadata' }  }
   function peg$f5() {    return { resource: '$serviceroot' }  }
-  function peg$f6(options) {    return CollapseObjectArray(options)  }
+  function peg$f6(options) {    return Object.fromEntries(options)  }
   function peg$f7(name, n) {    return [ 'Real', n ]  }
   function peg$f8(name, b) {    return [ 'Boolean', b ]  }
   function peg$f9(name, s) {    return [ 'Text', s ]  }
   function peg$f10(name, value) {    return !binds['@' + name]  }
   function peg$f11(name, value) {
     binds['@' + name] = value
-    return {
-    	name: '@' + name,
-    	value
-    }
+    return [ '@' + name, value ]
   }
-  function peg$f12(name, value) {    return { name, value }  }
-  function peg$f13(properties) {    return { name: '$orderby', value: { properties } }  }
+  function peg$f12(name, value) {    return [ name, value ]  }
+  function peg$f13(properties) {    return [ '$orderby', { properties } ]  }
   function peg$f14(property) {    return 'desc'  }
   function peg$f15(property, order) {
     property.order = order;
     return property
   }
-  function peg$f16(value) {    return { name: '$top', value }  }
-  function peg$f17(value) {    return { name: '$skip', value }  }
+  function peg$f16(value) {    return [ '$top', value ]  }
+  function peg$f17(value) {    return [ '$skip', value ]  }
   function peg$f18() {    return ''  }
-  function peg$f19(value) {    return { name: '$inlinecount', value }  }
-  function peg$f20(value) {    return { name: '$count', value }  }
-  function peg$f21(properties) {    return { name: '$expand', value: { properties } }  }
+  function peg$f19(value) {    return [ '$inlinecount', value ]  }
+  function peg$f20(value) {    return [ '$count', value ]  }
+  function peg$f21(properties) {    return [ '$expand', { properties } ]  }
   function peg$f22(properties) {    return { properties }  }
-  function peg$f23(value) {    return { name: '$select', value }  }
-  function peg$f24(expr) {    return { name: '$filter', value: expr }  }
-  function peg$f25(type, metadata) {    return { name: '$format', value: { type, metadata } }  }
-  function peg$f26(type) {    return { name: '$format', value: type }  }
+  function peg$f23(value) {    return [ '$select', value ]  }
+  function peg$f24(expr) {    return [ '$filter', expr ]  }
+  function peg$f25(type, metadata) {    return [ '$format', { type, metadata } ]  }
+  function peg$f26(type) {    return [ '$format', type ]  }
   function peg$f27() {
     precedence = 0;
   }
@@ -557,21 +546,21 @@ function peg$parse(input, options) {
   function peg$f42(methodName, args) {    return [ 'call', { args, method: methodName } ]  }
   function peg$f43(name) {    return { name }  }
   function peg$f44(result, property) {    result.property = property  }
-  function peg$f45(result, option) {    result.options = CollapseObjectArray([option])  }
+  function peg$f45(result, option) {    result.options = Object.fromEntries([option])  }
   function peg$f46(result) {    result.count = true  }
   function peg$f47(result, key) {    result.key = key  }
   function peg$f48(result, property) {    result.property = property  }
   function peg$f49(result) {    return result  }
   function peg$f50(name) {    return { name }  }
   function peg$f51(result) {    result.count = true  }
-  function peg$f52(result, options) {    result.options =  CollapseObjectArray(options)  }
+  function peg$f52(result, options) {    result.options =  Object.fromEntries(options)  }
   function peg$f53(result, next) {    result.property = next  }
   function peg$f54(result) {    return result  }
   function peg$f55(resource, next) {    return { name: resource, property: next }  }
   function peg$f56(resource, lambda) {    return { name: resource, lambda }  }
   function peg$f57(resource, method) {    return { name: resource, method }  }
-  function peg$f58(keyBinds) {    return CollapseObjectArray(keyBinds)  }
-  function peg$f59(name, value) {    return { name, value }  }
+  function peg$f58(keyBinds) {    return Object.fromEntries(keyBinds)  }
+  function peg$f59(name, value) {    return [ name, value ]  }
   function peg$f60(resource) {    return { resource }  }
   function peg$f61(result, key) {    result.key = key  }
   function peg$f62(result, link) {result.link = link  }

package/odata-parser.pegjs

@@ -65,14 +65,6 @@
 	// 	div: 5,
 	// 	mod: 5
 	// };
-
-	function CollapseObjectArray(options) {
-		const optionsObj = {};
-		for(const i in options) {
-			optionsObj[options[i].name] = options[i].value;
-		}
-		return optionsObj;
-	};
 }}
 {
 	let binds = [];
@@ -113,7 +105,7 @@ OData =
 
 QueryOptions =
 	options:QueryOption|1..,'&'|
-	{ return CollapseObjectArray(options) }
+	{ return Object.fromEntries(options) }
 
 QueryOption =
 		Dollar
@@ -148,20 +140,17 @@ ParameterAliasOption =
 	&{ return !binds['@' + name] }
 	{
 		binds['@' + name] = value
-		return {
-			name: '@' + name,
-			value
-		}
+		return [ '@' + name, value ]
 	}
 
 OperationParam =
 	name:Text '=' value:Text
-	{ return { name, value } }
+	{ return [ name, value ] }
 
 SortOption =
 	'orderby='
 	properties:SortProperty|1..,','|
-	{ return { name: '$orderby', value: { properties } } }
+	{ return [ '$orderby', { properties } ] }
 
 SortProperty =
 	property:PropertyPath
@@ -181,12 +170,12 @@ SortProperty =
 TopOption =
 	'top='
 	value:UnsignedIntegerBind
-	{ return { name: '$top', value } }
+	{ return [ '$top', value ] }
 
 SkipOption =
 	'skip='
 	value:UnsignedIntegerBind
-	{ return { name: '$skip', value } }
+	{ return [ '$skip', value ] }
 
 InlineCountOption =
 	'inlinecount='
@@ -195,17 +184,17 @@ InlineCountOption =
 	/	'none'
 	/	Text { return '' }
 	)
-	{ return { name: '$inlinecount', value } }
+	{ return [ '$inlinecount', value ] }
 
 CountOption =
 	'count='
 	value:Boolean
-	{ return { name: '$count', value } }
+	{ return [ '$count', value ] }
 
 ExpandOption =
 	'expand='
 	properties:ExpandPropertyPathList
-	{ return { name: '$expand', value: { properties } } }
+	{ return [ '$expand', { properties } ] }
 
 SelectOption =
 	'select='
@@ -214,13 +203,13 @@ SelectOption =
 	/	properties:PropertyPathList
 		{ return { properties } }
 	)
-	{ return { name: '$select', value } }
+	{ return [ '$select', value ] }
 
 
 FilterByOption =
 	'filter='
 	expr:FilterByExpression
-	{ return { name: '$filter', value: expr } }
+	{ return [ '$filter', expr ] }
 
 
 ContentType =
@@ -244,8 +233,8 @@ FormatOption =
 		/	'minimal'
 		/	'full'
 		)
-		{ return { name: '$format', value: { type, metadata } } }
-	/	'' { return { name: '$format', value: type } }
+		{ return [ '$format', { type, metadata } ] }
+	/	'' { return [ '$format', type ] }
 	)
 
 FilterByExpression =
@@ -344,7 +333,7 @@ FilterNegateExpression =
 GroupedPrimitive =
 	'(' spaces
 		bindings:(@Primitive|1..,',' spaces|)
-		spaces 
+		spaces
 	')'
 	{
 		const bindValues = [];
@@ -454,7 +443,7 @@ PropertyPath =
 					'('
 					(	Dollar
 						option:FilterByOption
-						{ result.options = CollapseObjectArray([option]) }
+						{ result.options = Object.fromEntries([option]) }
 					)
 					')'
 				)?
@@ -490,7 +479,7 @@ ExpandPropertyPath =
 		'('
 		(
 			options:QueryOption|1..,[&;]|
-			{ result.options =  CollapseObjectArray(options) }
+			{ result.options =  Object.fromEntries(options) }
 		/ ''
 		)
 		')'
@@ -516,12 +505,12 @@ Key =
 	'('
 	@(	KeyBind
 	/	keyBinds:NamedKeyBind|1..,','|
-		{ return CollapseObjectArray(keyBinds) }
+		{ return Object.fromEntries(keyBinds) }
 	)
 	')'
 NamedKeyBind =
 	name:ResourceName '=' value:KeyBind
-	{ return { name, value }}
+	{ return [ name, value ] }
 KeyBind =
 		NumberBind
 	/	QuotedTextBind

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "4.2.8",
+  "version": "4.2.9",
   "description": "An OData parser written in OMeta",
   "type": "commonjs",
   "main": "odata-parser.js",
@@ -40,6 +40,6 @@
     "npm": ">=8.1.0"
   },
   "versionist": {
-    "publishedAt": "2025-09-11T12:17:01.599Z"
+    "publishedAt": "2025-10-16T13:59:19.285Z"
   }
 }