@cabloy/utils 1.0.14 → 1.0.17

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
@@ -24,9 +24,19 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "lint": "eslint .",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "tsc:publish": "npm run clean && tsc",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
   "dependencies": {
-    "@cabloy/word-utils": "^2.0.0",
+    "@cabloy/module-info": "^1.3.10",
+    "@cabloy/word-utils": "^2.0.1",
     "cel-js": "^0.3.1",
-    "@cabloy/module-info": "^1.3.6"
-  }
-}
+    "chevrotain": "^11.0.3"
+  },
+  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b"
+}