@fibery/expression-utils 9.4.0 → 9.4.1

package/lib/src/types.d.ts

@@ -10,8 +10,8 @@ export type Query = {
     "q/select"?: Select;
     "q/offset"?: number;
     "q/order-by"?: OrderBy;
-    "q/limit"?: number | "q/no-limit";
-    "q/where"?: NestedArray<unknown>;
+    "q/limit"?: QueryLimit;
+    "q/where"?: Expression;
 };
 export type SubQuery = {
     "q/from": Expression;
@@ -21,6 +21,12 @@ export type SubQuery = {
     "q/limit"?: QueryLimit;
     "q/where"?: Expression;
 };
+export type FunctionsMeta = Record<string, {
+    overloads: {
+        "arg-types": string[];
+        "result-type": string;
+    }[];
+}>;
 export type ExpressionVisitor = {
     visitVariableExpression?: (expression: string, visitor?: ExpressionVisitor) => any;
     visitFunctionCallExpression?: (expression: [string, ...Expression[]], visitor?: ExpressionVisitor) => any;
@@ -28,7 +34,7 @@ export type ExpressionVisitor = {
     visitFieldExpression?: (expression: Expression, visitor?: ExpressionVisitor) => any;
     visitOrderByExpression?: (orderByExpression: OrderBy, visitor?: ExpressionVisitor) => any;
     visitQueryExpression?: (subQueryExpression: SubQuery, visitor?: ExpressionVisitor) => any;
-    visitExpression?: (expression: Expression, visitor?: ExpressionVisitor) => any;
+    visitExpression?: (expression: Expression | SubQuery | OrderBy | string, visitor?: ExpressionVisitor) => any;
     [key: string]: $TSFixMe;
 };
 export type ExpressionVisitorWithDefault = Required<ExpressionVisitor>;

package/lib/src/utils.d.ts

@@ -1,4 +1,4 @@
-import { ExpressionVisitorWithDefault, Expression, ExpressionVisitor, SubQuery } from "./types";
+import { Expression, ExpressionVisitor, ExpressionVisitorWithDefault, OrderBy, SubQuery } from "./types";
 import { FieldObject, TypeObject } from "@fibery/schema";
 export declare const assertIsValidExpression: (expression: Expression) => void;
 export declare const textTypes: string[];
@@ -11,19 +11,19 @@ export declare const firstLastFunctions: Set<string>;
 export declare const logicalOperators: Set<string>;
 export declare const relationalOperators: Set<string>;
 export declare const mathOperators: Set<string>;
-export declare const isFunctionCallExpression: (expression: Expression) => boolean;
+export declare const isFunctionCallExpression: (expression: Expression | SubQuery | OrderBy | string) => boolean;
 export declare const fromRootKeyword = "q/from-root";
-export declare const isFromRootFieldExpression: (expression: Expression) => boolean;
+export declare const isFromRootFieldExpression: (expression: Expression | SubQuery | OrderBy | string) => boolean;
 export declare const isDateRangeFunctionExpression: (expression: Expression) => boolean;
 export declare const isCollectionFunctionExpression: (expression: Expression) => boolean;
 export declare const isAccessFunctionExpression: (expresion: Expression) => boolean;
 export declare const isBinaryExpression: (expression: Expression) => boolean;
 export declare const isNaryExpression: (expression: Expression) => boolean;
-export declare const isVariableExpression: (expression: Expression | string | null) => boolean;
+export declare const isVariableExpression: (expression: Expression | SubQuery | OrderBy | string | null) => boolean;
 export declare const isMultiFieldAccess: (expression: Expression | string) => boolean;
-export declare const isMultiFieldExpression: (expression: Expression) => boolean;
-export declare const isFieldExpression: (expression: string | Expression) => boolean;
-export declare const isQueryExpression: (expression: Expression | SubQuery | null) => boolean;
+export declare const isMultiFieldExpression: (expression: Expression | SubQuery | OrderBy | string) => boolean;
+export declare const isFieldExpression: (expression: Expression | SubQuery | OrderBy | string) => boolean;
+export declare const isQueryExpression: (expression: Expression | SubQuery | OrderBy | string | null) => boolean;
 export declare const getFieldObjectsByFieldExpression: ({ typeObject, expression, }: {
     typeObject: TypeObject;
     expression: Expression;

package/lib/src/utils.js

@@ -59,10 +59,20 @@ const binaryOperations = new Set([
 exports.logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 exports.relationalOperators = new Set(["=", "!=", "<", ">", "<=", ">="]);
 exports.mathOperators = new Set(["+", "-", "*", "/", "q/+", "q/-", "q/concat"]);
-const isFunctionCallExpression = (expression) => expression.length > 1 &&
-    lodash_1.default.isString(expression[0]) &&
-    (expression[0].startsWith("q/") ||
-        ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
+const isFunctionCallExpression = (expression) => {
+    if (!Array.isArray(expression)) {
+        return false;
+    }
+    if (expression.length <= 1) {
+        return false;
+    }
+    const firstElement = expression[0];
+    if (!lodash_1.default.isString(firstElement)) {
+        return false;
+    }
+    return (firstElement.startsWith("q/") ||
+        ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(firstElement));
+};
 exports.isFunctionCallExpression = isFunctionCallExpression;
 exports.fromRootKeyword = "q/from-root";
 const isFromRootFieldExpression = (expression) => lodash_1.default.isArray(expression) && expression[0] === exports.fromRootKeyword;

package/lib/src/visitors.d.ts

@@ -33,7 +33,7 @@ export declare const getExpressionType: ({ expression, typeObject, functionsMeta
             "result-type": string;
         }[];
     }>;
-    onFieldNotFound: ({ currentTypeObject, fieldId }: {
+    onFieldNotFound?: ({ currentTypeObject, fieldId }: {
         currentTypeObject: TypeObject | null;
         fieldId: string;
     }) => {

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "9.4.0",
+  "version": "9.4.1",
   "description": "utils for working with fibery api expressions",
   "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
   "files": [
     "./lib"
   ],
@@ -34,8 +33,8 @@
     "jest-junit": "13.0.0",
     "typescript": "5.8.3",
     "@fibery/babel-preset": "7.4.0",
-    "@fibery/schema": "10.2.8",
-    "@fibery/eslint-config": "8.6.1"
+    "@fibery/eslint-config": "8.6.1",
+    "@fibery/schema": "10.2.8"
   },
   "peerDependencies": {
     "@fibery/schema": "10.2.8"
@@ -84,5 +83,6 @@
     "test:ci": "jest --reporters=default --reporters=jest-junit",
     "test:coverage": "jest --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/formulas --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
-  }
+  },
+  "types": "./lib/index.d.ts"
 }