feat: improve code quality (#40)

Author: regevbr

.github/workflows/ci.yml

@@ -25,30 +25,20 @@ jobs:
         node-version: [ 18.x, 20.x, 22.x, 24.x ]
 
     steps:
-
-      - name: Echo env variables
-        run: |
-          echo ref: ${{ github.event.client_payload.ref || github.ref }}
-          echo sha: ${{ github.event.client_payload.sha || github.sha }}
-          echo head ref: ${{ github.event.client_payload.head_ref || github.head_ref }}
-          echo base ref: ${{ github.event.client_payload.base_ref || github.base_ref }}
-          echo action: ${{ github.action }}
-          echo event: ${{ github.event_name }}
-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         name: Checkout
         with:
           ref: ${{ github.event.client_payload.ref || github.ref }}
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Get yarn cache directory
         id: yarn-cache-dir
         run: |
-          echo "::set-output name=dir::$(yarn cache dir)"
+          echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v4
         id: yarn-cache
@@ -101,22 +91,22 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: fetch
         run: |
           git fetch --prune --unshallow
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: ${{ env.REGISTRY }}
 
       - name: Get yarn cache directory
         id: yarn-cache-dir
         run: |
-          echo "::set-output name=dir::$(yarn cache dir)"
+          echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v4
         id: yarn-cache

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-expression-eval",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "json serializable rule engine / boolean expression evaluator",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/examples/evaluator/example.ts

@@ -1,8 +1,7 @@
-import {ExpressionContext, ExpressionFunction, getEvaluator} from './lib/evaluator';
+import {ExpressionContext, ExpressionFunction, getEvaluator, CustomEvaluatorFuncRunOptions} from './lib/evaluator';
 import {Expression, ExpressionParts} from '../..';
 import {Moment} from 'moment';
 import moment = require('moment');
-import {CustomEvaluatorFuncRunOptions} from './lib/evaluator';
 
 const context: ExpressionContext = {
     userId: 'a@b.com',

src/lib/evaluator.ts

@@ -102,12 +102,12 @@ async function evaluateCompareOp<C extends Context, Ignore>(expressionValue: Ext
         contextStringAssertion(expressionKey, contextValue);
         const regexpValue = computeValue(context, validation, expressionValue.regexp, expressionKey);
         expressionStringAssertion(expressionKey, regexpValue);
-        return Boolean(contextValue.match(new RegExp(regexpValue)));
+        return Boolean(new RegExp(regexpValue).exec(contextValue));
     } else if (isRegexiCompareOp(expressionValue)) {
         contextStringAssertion(expressionKey, contextValue);
         const regexpiValue = computeValue(context, validation, expressionValue.regexpi, expressionKey);
         expressionStringAssertion(expressionKey, regexpiValue);
-        return Boolean(contextValue.match(new RegExp(regexpiValue, `i`)));
+        return Boolean(new RegExp(regexpiValue, `i`).exec(contextValue));
     } else if (isGtCompareOp(expressionValue)) {
         contextNumberAssertion(expressionKey, contextValue);
         const gtValue = computeValue(context, validation, expressionValue.gt, expressionKey);

src/test/types/expressionParts.ts

@@ -93,8 +93,8 @@ type Expected = {
     },
 };
 
-declare var r: Result;
-declare var e: Expected;
+declare let r: Result;
+declare let e: Expected;
 
 r = e;
 e = r;

src/types/evaluator.ts

@@ -32,43 +32,46 @@ export interface MathOp<C extends Context, Ignore> {
     lhs: number | PropertyRef<C, Ignore, number>;
 }
 
+export type CompareValue<C extends Context, Ignore, V extends Primitive> =
+    V | PropertyRef<C, Ignore, V> | (V extends number ? MathOp<C, Ignore> : never);
+
+export type NumberCompareValue<C extends Context, Ignore> =
+    number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>;
+
 export interface EqualCompareOp<C extends Context, Ignore, V extends Primitive> {
-    eq: V | PropertyRef<C, Ignore, V> | (V extends number ? MathOp<C, Ignore> : never);
+    eq: CompareValue<C, Ignore, V>;
 }
 
 export interface NotEqualCompareOp<C extends Context, Ignore, V extends Primitive> {
-    neq: V | PropertyRef<C, Ignore, V> | (V extends number ? MathOp<C, Ignore> : never);
+    neq: CompareValue<C, Ignore, V>;
 }
 
 export interface InqCompareOp<C extends Context, Ignore, V extends Primitive> {
-    inq: (V | PropertyRef<C, Ignore, V> | (V extends number ? MathOp<C, Ignore> : never))[];
+    inq: CompareValue<C, Ignore, V>[];
 }
 
 export interface NinCompareOp<C extends Context, Ignore, V extends Primitive> {
-    nin: (V | PropertyRef<C, Ignore, V> | (V extends number ? MathOp<C, Ignore> : never))[];
+    nin: CompareValue<C, Ignore, V>[];
 }
 
 export interface BetweenCompareOp<C extends Context, Ignore> {
-    between: readonly [
-            number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>,
-            number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>
-    ];
+    between: readonly [NumberCompareValue<C, Ignore>, NumberCompareValue<C, Ignore>];
 }
 
 export interface GtCompareOp<C extends Context, Ignore> {
-    gt: number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>;
+    gt: NumberCompareValue<C, Ignore>;
 }
 
 export interface GteCompareOp<C extends Context, Ignore> {
-    gte: number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>;
+    gte: NumberCompareValue<C, Ignore>;
 }
 
 export interface LtCompareOp<C extends Context, Ignore> {
-    lt: number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>;
+    lt: NumberCompareValue<C, Ignore>;
 }
 
 export interface LteCompareOp<C extends Context, Ignore> {
-    lte: number | PropertyRef<C, Ignore, number> | MathOp<C, Ignore>;
+    lte: NumberCompareValue<C, Ignore>;
 }
 
 export interface RegexCompareOp<C extends Context, Ignore> {