Merge pull request #578 from balena-io/updatedeps

Add support for `/$count` with nested `$filter` in $orderby & $orderby

package.json

@@ -32,8 +32,8 @@
     "@balena/abstract-sql-compiler": "^7.20.0",
     "@balena/abstract-sql-to-typescript": "^1.2.0",
     "@balena/lf-to-abstract-sql": "^4.5.1",
-    "@balena/odata-parser": "^2.3.0",
-    "@balena/odata-to-abstract-sql": "^5.4.14",
+    "@balena/odata-parser": "^2.4.0",
+    "@balena/odata-to-abstract-sql": "^5.5.0",
     "@balena/sbvr-parser": "^1.4.1",
     "@balena/sbvr-types": "^3.4.7",
     "@types/body-parser": "^1.19.2",
@@ -42,7 +42,7 @@
     "@types/deep-freeze": "^0.1.2",
     "@types/express": "^4.17.13",
     "@types/express-session": "^1.17.5",
-    "@types/lodash": "^4.14.182",
+    "@types/lodash": "^4.14.185",
     "@types/memoizee": "^0.4.8",
     "@types/method-override": "^0.0.32",
     "@types/multer": "^1.4.7",

src/sbvr-api/uri-parser.ts

@@ -235,11 +235,7 @@ const memoizedOdata2AbstractSQL = (() => {
 		if (odataQuery.options) {
 			odataQuery = {
 				...odataQuery,
-				options: _.pick(
-					odataQuery.options,
-					// @ts-expect-error: lodash typings do not allow a single array of property paths arrays but lodash itself does and it has better performance than property path strings
-					cachedProps,
-				) as ODataOptions,
+				options: _.pick(odataQuery.options, cachedProps) as ODataOptions,
 			};
 		}
 		const { tree, extraBodyVars, extraBindVars } = $memoizedOdata2AbstractSQL(