@fibery/expression-utils 1.1.17 → 1.1.19

package/lib/expression-utils.js

@@ -639,12 +639,15 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/first and q/last.
         result = argTypes[0];
+      } else if (fnName === "q/if") {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[1];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
         if (!overload) {

package/lib/visitors.js

@@ -383,12 +383,15 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/first and q/last.
         result = argTypes[0];
+      } else if (fnName === "q/if") {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[1];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
         if (!overload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",

package/types.d.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import {TypeObject} from "@fibery/schema";
+import {Schema, TypeObject} from "@fibery/schema";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type $TSFixMe = any;
@@ -26,9 +26,34 @@ declare module "@fibery/expression-utils" {
       }) => $TSFixMe
     ): $TSFixMe;
 
-    deleteExpressionsWithNotFoundFieldsVisitor(typeObject): $TSFixMe;
+    deleteExpressionsWithNotFoundFieldsVisitor(typeObject: TypeObject): $TSFixMe;
+    getExpressionType({
+      expression,
+      typeObject,
+      functionsMeta,
+      onFieldNotFound,
+      returnRefTypeInsteadOfId,
+    }: {
+      expression: $TSFixMe;
+      typeObject: TypeObject;
+      functionsMeta: Record<string, $TSFixMe>;
+      onFieldNotFound?: (input: {currentTypeObject: TypeObject; fieldId: string}) => {currentTypeObject: TypeObject};
+      returnRefTypeInsteadOfId?: boolean;
+    });
+  };
+  export const utils: {
+    createExpressionVisitor: (visitor: $TSFixMe) => {visitExpression: (expression: $TSFixMe) => $TSFixMe};
+    firstLastFunctions: Set<string>;
+    isQueryExpression: (expression: $TSFixMe) => boolean;
+    isVariableExpression: (expression: $TSFixMe) => boolean;
+  };
+  export const contextVariables: {
+    getEntityQueryVariables: (
+      schema: Schema
+    ) => Array<{typeObject: TypeObject; id: string; title: string; isCollection: boolean; description: string}>;
   };
   export const paramsPlaceholders: {
+    formulaTodayDateParamPlaceholder: string;
     dynamicFilterParamPrefix: string;
 
     isDynamicFilterParam(paramValue: string): boolean;