@cabloy/utils 1.0.29 → 1.0.30

package/dist/cel.d.ts

@@ -1,5 +1,6 @@
-import type * as CelJS from 'cel-js' with { 'resolution-mode': 'import' };
+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 const CeljsPrefix = "#!#";
+export declare function evaluateExpressions(expressions: any, context?: Record<string, unknown>, functions?: Record<string, CallableFunction>, dry?: boolean): 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;
+export declare function parse(expression: string): Celjs.ParseResult;

package/dist/cel.js

@@ -1,20 +1,35 @@
 import * as celjs from 'cel-js';
 import { isNil } from "./check.js";
-export function evaluateExpressions(expressions, context, functions) {
+export const CeljsPrefix = '#!#';
+export function evaluateExpressions(expressions, context, functions, dry) {
     if (isNil(expressions))
-        return expressions;
+        return _returnExpressionWithDry(expressions, dry);
     if (Array.isArray(expressions)) {
-        return expressions.map(item => evaluate(item, context, functions));
+        return expressions.map(item => _evaluateExpressionInner(item, context, functions, dry));
     }
     else if (typeof expressions === 'object') {
         const res = {};
         for (const key in expressions) {
-            res[key] = evaluate(expressions[key], context, functions);
+            res[key] = _evaluateExpressionInner(expressions[key], context, functions, dry);
         }
         return res;
     }
     // others
-    return evaluate(expressions, context, functions);
+    return _evaluateExpressionInner(expressions, context, functions, dry);
+}
+function _evaluateExpressionInner(expression, context, functions, dry) {
+    if (isNil(expression))
+        return _returnExpressionWithDry(expression, dry);
+    if (typeof expression === 'object')
+        return evaluateExpressions(expression, context, functions, dry);
+    if (typeof expression !== 'string')
+        return _returnExpressionWithDry(expression, dry);
+    if (!expression.startsWith(CeljsPrefix))
+        return _returnExpressionWithDry(expression, dry);
+    return dry ? true : evaluate(expression.substring(CeljsPrefix.length), context, functions);
+}
+function _returnExpressionWithDry(expression, dry) {
+    return dry ? false : expression;
 }
 export function evaluate(expression, context, functions) {
     // CstNode
@@ -23,8 +38,8 @@ export function evaluate(expression, context, functions) {
     }
     // string
     if (typeof expression === 'string') {
-        if (expression.startsWith('##')) {
-            return expression.substring('##'.length);
+        if (expression.startsWith(CeljsPrefix)) {
+            return expression.substring(CeljsPrefix.length);
         }
         return celjs.evaluate(expression, context, functions);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"