@cabloy/utils 1.0.13 → 1.0.15

package/dist/cel.d.ts

@@ -1,4 +1,5 @@
 import type * as CelJS from 'cel-js' with { 'resolution-mode': 'import' };
+import type { CstNode } from 'chevrotain';
 export declare function evaluateExpressions(expressions: any, context?: Record<string, unknown>, functions?: Record<string, CallableFunction>): unknown;
-export declare function evaluate(expression: string, context?: Record<string, unknown>, functions?: Record<string, CallableFunction>): unknown;
+export declare function evaluate(expression: CstNode | string, context?: Record<string, unknown>, functions?: Record<string, CallableFunction>): unknown;
 export declare function parse(expression: string): CelJS.ParseResult;

package/dist/cel.js

@@ -17,12 +17,19 @@ export function evaluateExpressions(expressions, context, functions) {
     return evaluate(expressions, context, functions);
 }
 export function evaluate(expression, context, functions) {
-    if (typeof expression !== 'string')
-        return expression;
-    if (expression.startsWith('##')) {
-        return expression.substring('##'.length);
+    // CstNode
+    if (typeof expression === 'object' && expression.children) {
+        return celjs.evaluate(expression, context, functions);
     }
-    return celjs.evaluate(expression, context, functions);
+    // string
+    if (typeof expression === 'string') {
+        if (expression.startsWith('##')) {
+            return expression.substring('##'.length);
+        }
+        return celjs.evaluate(expression, context, functions);
+    }
+    // others
+    return expression;
 }
 export function parse(expression) {
     return celjs.parse(expression);

package/dist/utils.d.ts

@@ -3,8 +3,8 @@ export declare function catchError<T>(fnMethod: (...args: any[]) => Promise<T>):
 export declare function sleep(ms: any): Promise<unknown>;
 export declare function replaceTemplate(content: string, scope: object): string;
 export declare function setProperty<T>(obj: object, name: string, value: T): void;
-export declare function getProperty<T>(obj: object, name: string, sep?: string): T | undefined;
-export declare function getPropertyObject<T>(obj: object, name: string, sep?: string): T | undefined;
+export declare function getProperty<T>(obj: object | undefined, name: string, sep?: string): T | undefined;
+export declare function getPropertyObject<T>(obj: object | undefined, name: string, sep?: string): T | undefined;
 export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
 export declare function evaluateSimple(expression: string, scope?: object): any;
 export declare function getRandomInt(size: number, start?: number): number;

package/dist/utils.js

@@ -53,9 +53,10 @@ export function getProperty(obj, name, sep) {
 export function getPropertyObject(obj, name, sep) {
     return _getProperty(obj, name, sep, true);
 }
-function _getProperty(obj, name, sep, forceObject) {
-    if (!obj)
+function _getProperty(_obj, name, sep, forceObject) {
+    if (!_obj)
         return undefined;
+    let obj = _obj;
     const names = name.split(sep || '.');
     // loop
     for (const name of names) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
@@ -25,8 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@cabloy/word-utils": "^2.0.0",
+    "@cabloy/word-utils": "^2.0.1",
     "cel-js": "^0.3.1",
-    "@cabloy/module-info": "^1.3.6"
+    "chevrotain": "^11.0.3",
+    "@cabloy/module-info": "^1.3.7"
   }
 }