@cabloy/utils 1.0.32 → 1.0.34

package/dist/cel.d.ts

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

package/dist/cel.js

@@ -1,8 +1,8 @@
 import * as celjs from '@cabloy/cel-js';
 import { isNil } from "./check.js";
 import { hashkey } from "./hash.js";
+import { StringPrefixCel, StringPrefixRaw } from "./types.js";
 import { getProperty } from "./utils.js";
-export const CeljsPrefix = '#!#';
 export function evaluateExpressions(expressions, context, functions, dry) {
     if (isNil(expressions))
         return _returnExpressionWithDry(expressions, dry);
@@ -26,9 +26,9 @@ function _evaluateExpressionInner(expression, context, functions, dry) {
         return evaluateExpressions(expression, context, functions, dry);
     if (typeof expression !== 'string')
         return _returnExpressionWithDry(expression, dry);
-    if (!expression.startsWith(CeljsPrefix))
+    if (!expression.startsWith(StringPrefixCel))
         return _returnExpressionWithDry(expression, dry);
-    return dry ? true : evaluate(expression.substring(CeljsPrefix.length), context, functions);
+    return dry ? true : evaluate(expression.substring(StringPrefixCel.length), context, functions);
 }
 function _returnExpressionWithDry(expression, dry) {
     return dry ? false : expression;
@@ -42,8 +42,8 @@ export function evaluate(expression, context, functions) {
     }
     // string
     if (typeof expression === 'string') {
-        if (expression.startsWith(CeljsPrefix)) {
-            return expression.substring(CeljsPrefix.length);
+        if (expression.startsWith(StringPrefixRaw)) {
+            return expression.substring(StringPrefixRaw.length);
         }
         return celjs.evaluate(expression, context, functions);
     }

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 export * from './cel.ts';
 export * from './check.ts';
 export * from './hash.ts';
+export * from './match.ts';
+export * from './types.ts';
 export * from './utils.ts';
 export * from './vona.ts';

package/dist/index.js

@@ -1,5 +1,7 @@
 export * from "./cel.js";
 export * from "./check.js";
 export * from "./hash.js";
+export * from "./match.js";
+export * from "./types.js";
 export * from "./utils.js";
 export * from "./vona.js";

package/dist/match.d.ts

@@ -0,0 +1,4 @@
+export type TypeMatchSelectorFunction = (this: any, ...args: any[]) => boolean;
+export type TypeMatchSelectorRule<T> = T | RegExp | TypeMatchSelectorFunction;
+export type TypeMatchSelectorRules<T> = (TypeMatchSelectorRule<T>)[] | TypeMatchSelectorRule<T>;
+export declare function matchSelector<T>(match: TypeMatchSelectorRules<T>, selector: string | boolean, matchThis?: any, ...matchArgs: any[]): any;

package/dist/match.js

@@ -0,0 +1,16 @@
+import { evaluateExpressions } from "./cel.js";
+import { StringPrefixCel, StringPrefixRegexp } from "./types.js";
+import { evaluateSimple } from "./utils.js";
+export function matchSelector(match, selector, matchThis, ...matchArgs) {
+    if (!Array.isArray(match)) {
+        // prepare
+        if (typeof match === 'string' && match.startsWith(StringPrefixRegexp)) {
+            match = evaluateSimple(match.substring(StringPrefixRegexp.length));
+        }
+        return ((typeof match === 'string' && match.startsWith(StringPrefixCel) && !!evaluateExpressions(match, { selector, context: matchArgs[0], args: matchArgs })) ||
+            (typeof match === 'string' && !match.startsWith(StringPrefixCel) && typeof selector === 'string' && match === selector) ||
+            (match instanceof RegExp && typeof selector === 'string' && match.test(selector)) ||
+            (typeof match === 'function' && match.call(matchThis, selector, ...matchArgs)));
+    }
+    return match.some(item => matchSelector(item, selector));
+}

package/dist/types.d.ts

@@ -0,0 +1,3 @@
+export declare const StringPrefixRegexp = "regexp://";
+export declare const StringPrefixCel = "cel://";
+export declare const StringPrefixRaw = "raw://";

package/dist/types.js

@@ -0,0 +1,3 @@
+export const StringPrefixRegexp = 'regexp://';
+export const StringPrefixCel = 'cel://';
+export const StringPrefixRaw = 'raw://';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
@@ -25,8 +25,8 @@
     "dist"
   ],
   "dependencies": {
-    "@cabloy/cel-js": "^0.7.2",
-    "@cabloy/module-info": "^1.3.23",
+    "@cabloy/cel-js": "^0.7.3",
+    "@cabloy/module-info": "^1.3.24",
     "@cabloy/word-utils": "^2.0.1",
     "chevrotain": "^11.0.3",
     "object-hash": "^3.0.0"