@fibery/query-utils 1.1.1 → 1.1.2

package/lib/src/query.d.ts

@@ -1,4 +1,4 @@
-import { Expression, FiberyObject, OrderBy } from "@fibery/expression-utils/src/types";
+import { Expression, FieldExpression, FiberyObject, OrderBy } from "@fibery/expression-utils/src/types";
 import { FieldObject, TypeObject } from "@fibery/schema";
 import { $TSFixMe } from "./tsfixme";
 export declare const extractReferenceField: (expression: Expression) => string;
@@ -9,7 +9,7 @@ export declare function extractFieldObjectFromExpression({ expression, typeObjec
     typeObject: TypeObject;
 }): FieldObject | null;
 export declare const warnAboutNonProcessedKeys: (location: string, rest: Record<string, unknown>) => void;
-export declare const getValueByFieldExpression: (object: $TSFixMe, path: Expression) => any;
+export declare const getValueByFieldExpression: (object: $TSFixMe, path: FieldExpression) => any;
 export declare const parseMultiFieldValue: ({ multiFieldValue, multiFieldObject, }: {
     multiFieldValue?: Record<string, unknown> | null;
     multiFieldObject: FieldObject;
@@ -33,10 +33,10 @@ export declare const calculateSortObjectsFn: ({ typeObject }: {
     <T>(value: T): T;
     (): undefined;
 } | ((objects: $TSFixMe) => any[]);
-export declare const extractSingleField: (expression: Expression) => string;
+export declare const extractSingleField: (expression: FieldExpression) => string;
 export declare const getQuerySelectForExpression: ({ typeObject, expression, selectsByTypeLookup, }: {
     typeObject: TypeObject;
-    expression: Expression;
+    expression: FieldExpression;
     selectsByTypeLookup?: Record<string, $TSFixMe>;
 }) => any;
 export declare const getOrderBySelect: (orderBy: OrderBy | undefined | null, typeObject: TypeObject) => any;

package/lib/src/query.js

@@ -70,7 +70,6 @@ const warnAboutNonProcessedKeys = (location, rest) => {
 };
 exports.warnAboutNonProcessedKeys = warnAboutNonProcessedKeys;
 const getValueByFieldExpression = (object, path) => {
-    // TODO: review types. According to Expression it might be nested array but looks like we ignore it everywhere
     return path.reduce((memo, key) => {
         if (memo === undefined) {
             return undefined;
@@ -187,9 +186,9 @@ const getOrderBySelect = (orderBy, typeObject) => {
         const orderingExpression = ordering[0];
         return (0, exports.getQuerySelectForExpression)({
             typeObject,
-            expression: (0, utils_1.isDateRangeFunctionExpression)(orderingExpression)
+            expression: ((0, utils_1.isDateRangeFunctionExpression)(orderingExpression)
                 ? orderingExpression[1]
-                : orderingExpression,
+                : orderingExpression),
         });
     })
         // always include rank, as it is used for card creation, see `calculateNewCardRank`.

package/lib/src/select.d.ts

@@ -23,7 +23,7 @@ export declare const annotateNormalizedSelect: (normalizedSelect: Select) => ({
         isDynamicSelect: boolean;
     };
     rhs: {
-        value: any;
+        value: Expression | Record<string, Expression>;
         isDynamicSelect: boolean;
         isQueryExpression: boolean;
         isPlainObject: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/query-utils",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Construct, normalize and denormalize Fibery core queries",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -27,7 +27,7 @@
     "memoize-one": "6.0.0",
     "moment": "2.29.4",
     "uuid": "11.1.0",
-    "@fibery/expression-utils": "9.6.1",
+    "@fibery/expression-utils": "9.6.2",
     "@fibery/helpers": "1.4.0"
   },
   "devDependencies": {
@@ -39,10 +39,10 @@
     "typescript": "5.9.3",
     "@fibery/babel-preset": "7.4.1",
     "@fibery/eslint-config": "9.0.0",
-    "@fibery/schema": "10.2.12"
+    "@fibery/schema": "10.2.13"
   },
   "peerDependencies": {
-    "@fibery/schema": "10.2.12"
+    "@fibery/schema": "10.2.13"
   },
   "jest": {
     "testEnvironment": "node",