@balena/odata-parser 2.4.3 → 2.4.4

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Use shorthand object notation
+      hash: 611c0480681965c7af06302264eac79fea18bded
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+  version: 2.4.4
+  title: ""
+  date: 2023-02-23T16:23:23.783Z
 - commits:
     - subject: Update dependencies
       hash: 25b153aca258347c6742cb8b4efe54c0ae199695
@@ -8,7 +19,7 @@
       author: Pagan Gazzard
   version: 2.4.3
   title: ""
-  date: 2023-02-23T16:09:08.975Z
+  date: 2023-02-23T16:14:13.013Z
 - commits:
     - subject: Test that `/$count` works with a `$filter`containing an 'and'
       hash: cda0a1a54b2830cd393240dd5dddf1e4b42877c4

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.4.4
+## (2023-02-23)
+
+* Use shorthand object notation [Pagan Gazzard]
+
 # v2.4.3
 ## (2023-02-23)
 

package/odata-parser.js

@@ -395,7 +395,7 @@ function peg$parse(input, options) {
   var peg$e109 = peg$literalExpectation("%20", false);
 
   var peg$f0 = function() {reset(); return true;};
-  var peg$f1 = function(tree) { return { tree: tree, binds: binds } };
+  var peg$f1 = function(tree) { return { tree, binds } };
   var peg$f2 = function() {
 		reset();
 		var tree = eval(`peg$parse${options.rule}()`);
@@ -416,24 +416,24 @@ function peg$parse(input, options) {
 		binds['@' + name] = value
 		return {
 			name: '@' + name,
-			value: value
+			value
 		}
 	};
-  var peg$f12 = function(name, value) { return { name: name, value: value } };
+  var peg$f12 = function(name, value) { return { name, 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
 	};
-  var peg$f16 = function(value) { return { name: '$top', value: value } };
-  var peg$f17 = function(value) { return { name: '$skip', value: value } };
+  var peg$f16 = function(value) { return { name: '$top', value } };
+  var peg$f17 = function(value) { return { name: '$skip', value } };
   var peg$f18 = function() { return '' };
-  var peg$f19 = function(value) { return { name: '$inlinecount', value: value } };
-  var peg$f20 = function(value) { return { name: '$count', value: value } };
-  var peg$f21 = function(properties) { return { name: '$expand', value: { properties: properties } } };
-  var peg$f22 = function(properties) { return { properties: properties } };
-  var peg$f23 = function(value) { return { name: '$select', value: value } };
+  var peg$f19 = function(value) { return { name: '$inlinecount', value } };
+  var peg$f20 = function(value) { return { name: '$count', value } };
+  var peg$f21 = function(properties) { return { name: '$expand', value: { properties } } };
+  var peg$f22 = function(properties) { return { properties } };
+  var peg$f23 = function(value) { return { name: '$select', value } };
   var peg$f24 = function(expr) { return { name: '$filter', value: expr } };
   var peg$f25 = function(type, metadata) { return { name: '$format', value: { type, metadata } } };
   var peg$f26 = function(type) { return { name: '$format', value: type } };
@@ -466,11 +466,11 @@ function peg$parse(input, options) {
   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$f40 = function(methodName, args) { return [ 'call', { args, method: methodName } ] };
+  var peg$f41 = function(name, identifier, expression) { return { expression, identifier, method: name } };
   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$f44 = function(methodName, args) { return [ 'call', { args, method: methodName } ] };
   var peg$f45 = function(path, paths) { return [path, ...paths] };
   var peg$f46 = function(resource, property, option) { return CollapseObjectArray([option]) };
   var peg$f47 = function(resource, property, optionsObj) { return { count: true, options: optionsObj } };
@@ -479,10 +479,10 @@ function peg$parse(input, options) {
   var peg$f50 = function(resource) { return true };
   var peg$f51 = function(resource, count, option, options) { return CollapseObjectArray([option, ...options]) };
   var peg$f52 = function(resource, count) { return {} };
-  var peg$f53 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count: count, options: optionsObj} };
+  var peg$f53 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count, options: optionsObj} };
   var peg$f54 = function(resource, next) { return { name: resource, property: next } };
-  var peg$f55 = function(resource, lambda) { return { name: resource, lambda: lambda } };
-  var peg$f56 = function(resource, method) { return { name: resource, method: method } };
+  var peg$f55 = function(resource, lambda) { return { name: resource, lambda } };
+  var peg$f56 = function(resource, method) { return { name: resource, method } };
   var peg$f57 = function(keyBind, keyBinds) { return CollapseObjectArray([keyBind, ...keyBinds]) };
   var peg$f58 = function(name, value) { return { name, value }};
   var peg$f59 = function(resource) { return { resource } };

package/odata-parser.pegjs

@@ -90,7 +90,7 @@
 Process =
 	&{reset(); return true;}
 	tree:OData
-	{ return { tree: tree, binds: binds } }
+	{ return { tree, binds } }
 
 ProcessRule =
 	'' {
@@ -153,13 +153,13 @@ ParameterAliasOption =
 		binds['@' + name] = value
 		return {
 			name: '@' + name,
-			value: value
+			value
 		}
 	}
 
 OperationParam =
 	name:Text '=' value:Text
-	{ return { name: name, value: value } }
+	{ return { name, value } }
 
 SortOption =
 	'orderby='
@@ -188,12 +188,12 @@ SortProperty =
 TopOption =
 	'top='
 	value:UnsignedInteger
-	{ return { name: '$top', value: value } }
+	{ return { name: '$top', value } }
 
 SkipOption =
 	'skip='
 	value:UnsignedInteger
-	{ return { name: '$skip', value: value } }
+	{ return { name: '$skip', value } }
 
 InlineCountOption =
 	'inlinecount='
@@ -202,26 +202,26 @@ InlineCountOption =
 	/	'none'
 	/	Text { return '' }
 	)
-	{ return { name: '$inlinecount', value: value } }
+	{ return { name: '$inlinecount', value } }
 
 CountOption =
 	'count='
 	value:Boolean
-	{ return { name: '$count', value: value } }
+	{ return { name: '$count', value } }
 
 ExpandOption =
 	'expand='
 	properties:ExpandPropertyPathList
-	{ return { name: '$expand', value: { properties: properties } } }
+	{ return { name: '$expand', value: { properties } } }
 
 SelectOption =
 	'select='
 	value:(
 		'*'
 	/	properties:PropertyPathList
-		{ return { properties: properties } }
+		{ return { properties } }
 	)
-	{ return { name: '$select', value: value } }
+	{ return { name: '$select', value } }
 
 
 FilterByOption =
@@ -410,7 +410,7 @@ FilterMethodCallExpression =
 		)
 		&{ return args.length === methods[methodName] || (Array.isArray(methods[methodName]) && methods[methodName].includes(args.length)) }
 	')'
-	{ return [ 'call', { args: args, method: methodName } ] }
+	{ return [ 'call', { args, method: methodName } ] }
 
 LambdaMethodCall =
 	name:(
@@ -424,7 +424,7 @@ LambdaMethodCall =
 		expression:FilterByExpression
 		spaces
 	')'
-	{ return { expression: expression, identifier: identifier, method: name } }
+	{ return { expression, identifier, method: name } }
 
 ResourceMethodCall =
 	methodName:ResourceName
@@ -443,7 +443,7 @@ ResourceMethodCall =
 		/ '' { return [] }
 		)
 	')'
-	{ return [ 'call', { args: args, method: methodName } ] }
+	{ return [ 'call', { args, method: methodName } ] }
 
 PropertyPathList =
 	path:PropertyPath
@@ -500,7 +500,7 @@ ExpandPropertyPath =
 		'/'
 		@PropertyPath
 	)?
-	{ return { name: resource, property: next, count: count, options: optionsObj} }
+	{ return { name: resource, property: next, count, options: optionsObj} }
 
 LambdaPropertyPath =
 	resource:ResourceName
@@ -508,9 +508,9 @@ LambdaPropertyPath =
 	@(	next:LambdaPropertyPath
 		{ return { name: resource, property: next } }
 	/	lambda:LambdaMethodCall
-		{ return { name: resource, lambda: lambda } }
+		{ return { name: resource, lambda } }
 	/	method:ResourceMethodCall
-		{ return { name: resource, method: method } }
+		{ return { name: resource, method } }
 	)
 Key =
 	'('

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/odata-parser",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "An OData parser written in OMeta",
   "main": "odata-parser.js",
   "scripts": {
@@ -37,6 +37,6 @@
     "_": "test/run.js"
   },
   "versionist": {
-    "publishedAt": "2023-02-23T16:09:09.111Z"
+    "publishedAt": "2023-02-23T16:23:23.948Z"
   }
 }