@cabloy/utils 1.0.3 → 1.0.5

package/dist/cel.d.ts

@@ -0,0 +1,4 @@
+import type * as CelJS from 'cel-js' with { 'resolution-mode': 'import' };
+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 parse(expression: string): CelJS.ParseResult;

package/dist/cel.js

@@ -0,0 +1,29 @@
+import * as celjs from 'cel-js';
+import { isNil } from "./check.js";
+export function evaluateExpressions(expressions, context, functions) {
+    if (isNil(expressions))
+        return expressions;
+    if (Array.isArray(expressions)) {
+        return expressions.map(item => evaluate(item, context, functions));
+    }
+    else if (typeof expressions === 'object') {
+        const res = {};
+        for (const key in expressions) {
+            res[key] = evaluate(expressions[key], context, functions);
+        }
+        return res;
+    }
+    // others
+    return evaluate(expressions, context, functions);
+}
+export function evaluate(expression, context, functions) {
+    if (typeof expression !== 'string')
+        return expression;
+    if (expression.startsWith('##')) {
+        return expression.substring('##'.length);
+    }
+    return celjs.evaluate(expression, context, functions);
+}
+export function parse(expression) {
+    return celjs.parse(expression);
+}

package/dist/check.d.ts

@@ -1,17 +1,17 @@
 export declare const isUndefined: (obj: any) => obj is undefined;
+export declare const isNil: (val: any) => val is null | undefined;
 export declare const isObject: (fn: any) => fn is object;
-export declare const isPlainObject: (fn: any) => fn is object;
-export declare const addLeadingSlash: (path?: string) => string;
-export declare const normalizePath: (path?: string) => string;
+export declare function isEmptyObject(obj: any): boolean;
+export declare function isPlainObject(fn: any): fn is object;
+export declare function addLeadingSlash(path?: string): string;
+export declare function normalizePath(path?: string): string;
 export declare const stripEndSlash: (path: string) => string;
 export declare const isFunction: (val: any) => val is Function;
 export declare const isString: (val: any) => val is string;
 export declare const isNumber: (val: any) => val is number;
 export declare const isConstructor: (val: any) => boolean;
-export declare const isNil: (val: any) => val is null | undefined;
 export declare const isEmpty: (array: any) => boolean;
 export declare const isSymbol: (val: any) => val is symbol;
 export declare function isPromise(obj: any): obj is Promise<any>;
 export declare function isNilOrEmptyString(str?: string | undefined | null): str is null | undefined | '';
 export declare function checkMeta(meta?: {}, data?: {}): boolean;
-//# sourceMappingURL=check.d.ts.map

package/dist/check.js

@@ -1,13 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkMeta = exports.isNilOrEmptyString = exports.isPromise = exports.isSymbol = exports.isEmpty = exports.isNil = exports.isConstructor = exports.isNumber = exports.isString = exports.isFunction = exports.stripEndSlash = exports.normalizePath = exports.addLeadingSlash = exports.isPlainObject = exports.isObject = exports.isUndefined = void 0;
-/* eslint-disable @typescript-eslint/no-use-before-define */
-const isUndefined = (obj) => typeof obj === 'undefined';
-exports.isUndefined = isUndefined;
-const isObject = (fn) => !(0, exports.isNil)(fn) && typeof fn === 'object';
-exports.isObject = isObject;
-const isPlainObject = (fn) => {
-    if (!(0, exports.isObject)(fn)) {
+export const isUndefined = (obj) => typeof obj === 'undefined';
+export const isNil = (val) => isUndefined(val) || val === null;
+export const isObject = (fn) => !isNil(fn) && typeof fn === 'object';
+export function isEmptyObject(obj) {
+    if (!obj)
+        return true;
+    return Object.keys(obj).length === 0;
+}
+export function isPlainObject(fn) {
+    if (!isObject(fn)) {
         return false;
     }
     const proto = Object.getPrototypeOf(fn);
@@ -18,48 +18,38 @@ const isPlainObject = (fn) => {
     return (typeof ctor === 'function' &&
         ctor instanceof ctor &&
         Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object));
-};
-exports.isPlainObject = isPlainObject;
-const addLeadingSlash = (path) => path && typeof path === 'string' ? (path.charAt(0) !== '/' ? '/' + path : path) : '';
-exports.addLeadingSlash = addLeadingSlash;
-const normalizePath = (path) => path
-    ? path.startsWith('/')
-        ? ('/' + path.replace(/\/+$/, '')).replace(/\/+/g, '/')
-        : '/' + path.replace(/\/+$/, '')
-    : '/';
-exports.normalizePath = normalizePath;
-const stripEndSlash = (path) => (path[path.length - 1] === '/' ? path.slice(0, path.length - 1) : path);
-exports.stripEndSlash = stripEndSlash;
-const isFunction = (val) => typeof val === 'function';
-exports.isFunction = isFunction;
-const isString = (val) => typeof val === 'string';
-exports.isString = isString;
-const isNumber = (val) => typeof val === 'number';
-exports.isNumber = isNumber;
-const isConstructor = (val) => val === 'constructor';
-exports.isConstructor = isConstructor;
-const isNil = (val) => (0, exports.isUndefined)(val) || val === null;
-exports.isNil = isNil;
-const isEmpty = (array) => !(array && array.length > 0);
-exports.isEmpty = isEmpty;
-const isSymbol = (val) => typeof val === 'symbol';
-exports.isSymbol = isSymbol;
-function isPromise(obj) {
+}
+export function addLeadingSlash(path) {
+    return path && typeof path === 'string' ? (path.charAt(0) !== '/' ? `/${path}` : path) : '';
+}
+export function normalizePath(path) {
+    return path
+        ? path.startsWith('/')
+            ? (`/${path.replace(/\/+$/, '')}`).replace(/\/+/g, '/')
+            : `/${path.replace(/\/+$/, '')}`
+        : '/';
+}
+export const stripEndSlash = (path) => (path[path.length - 1] === '/' ? path.slice(0, path.length - 1) : path);
+export const isFunction = (val) => typeof val === 'function';
+export const isString = (val) => typeof val === 'string';
+export const isNumber = (val) => typeof val === 'number';
+export const isConstructor = (val) => val === 'constructor';
+export const isEmpty = (array) => !(array && array.length > 0);
+export const isSymbol = (val) => typeof val === 'symbol';
+export function isPromise(obj) {
     return obj instanceof Promise || (obj && typeof obj.then === 'function');
 }
-exports.isPromise = isPromise;
-function isNilOrEmptyString(str) {
+export function isNilOrEmptyString(str) {
     return str === undefined || str === null || str === '';
 }
-exports.isNilOrEmptyString = isNilOrEmptyString;
-function checkMeta(meta, data) {
+export function checkMeta(meta, data) {
     // check none
     if (!meta)
         return true;
     // loop
     for (const key in meta) {
         const metaItem = meta[key];
-        if ((0, exports.isNil)(metaItem))
+        if (isNil(metaItem))
             continue;
         if (!Array.isArray(metaItem) && metaItem !== data?.[key])
             return false;
@@ -69,5 +59,3 @@ function checkMeta(meta, data) {
     // default
     return true;
 }
-exports.checkMeta = checkMeta;
-//# sourceMappingURL=check.js.map

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './check.js';
-export * from './utils.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './cel.ts';
+export * from './check.ts';
+export * from './utils.ts';

package/dist/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./check.js"), exports);
-__exportStar(require("./utils.js"), exports);
-//# sourceMappingURL=index.js.map
+export * from "./cel.js";
+export * from "./check.js";
+export * from "./utils.js";

package/dist/utils.d.ts

@@ -5,6 +5,4 @@ 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 evaluate(expression: string, scope?: object): any;
 export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
-//# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFunction = exports.evaluate = exports.getPropertyObject = exports.getProperty = exports.setProperty = exports.replaceTemplate = exports.sleep = exports.catchError = exports.deprecated = void 0;
-function deprecated(oldUsage, newUsage) {
+export function deprecated(oldUsage, newUsage) {
     const message = '`'
         .concat(oldUsage, '` is deprecated and will be removed in a later version. Use `')
         .concat(newUsage, '` instead');
-    return console.warn(message);
+    console.warn(message);
 }
-exports.deprecated = deprecated;
-async function catchError(fnMethod) {
+export async function catchError(fnMethod) {
     let error;
     let data;
     try {
@@ -19,15 +15,13 @@ async function catchError(fnMethod) {
     }
     return error ? [undefined, error] : [data, undefined];
 }
-exports.catchError = catchError;
-async function sleep(ms) {
+export async function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
-exports.sleep = sleep;
-function replaceTemplate(content, scope) {
+export function replaceTemplate(content, scope) {
     if (!content)
         return content;
-    return content.toString().replace(/(\\)?{{ *([\w\.]+) *}}/g, (block, skip, key) => {
+    return content.toString().replace(/(\\)?\{\{ *([\w.]+) *\}\}/g, (block, skip, key) => {
         if (skip) {
             return block.substring(skip.length);
         }
@@ -35,8 +29,7 @@ function replaceTemplate(content, scope) {
         return value !== undefined ? value : '';
     });
 }
-exports.replaceTemplate = replaceTemplate;
-function setProperty(obj, name, value) {
+export function setProperty(obj, name, value) {
     const names = name.split('.');
     if (names.length === 1) {
         obj[name] = value;
@@ -54,15 +47,12 @@ function setProperty(obj, name, value) {
         obj[names[names.length - 1]] = value;
     }
 }
-exports.setProperty = setProperty;
-function getProperty(obj, name, sep) {
+export function getProperty(obj, name, sep) {
     return _getProperty(obj, name, sep, false);
 }
-exports.getProperty = getProperty;
-function getPropertyObject(obj, name, sep) {
+export function getPropertyObject(obj, name, sep) {
     return _getProperty(obj, name, sep, true);
 }
-exports.getPropertyObject = getPropertyObject;
 function _getProperty(obj, name, sep, forceObject) {
     if (!obj)
         return undefined;
@@ -82,20 +72,7 @@ function _getProperty(obj, name, sep, forceObject) {
     }
     return obj;
 }
-function evaluate(expression, scope) {
-    if (!scope)
-        return _evaluateSimple(expression);
-    const scopeKeys = Object.keys(scope);
-    const scopeParams = [];
-    for (let i = 0; i < scopeKeys.length; i++) {
-        const key = scopeKeys[i];
-        scopeParams.push(scope[key]);
-    }
-    const fn = createFunction(expression, scopeKeys);
-    return fn(...scopeParams);
-}
-exports.evaluate = evaluate;
-function createFunction(expression, scopeKeys) {
+export function createFunction(expression, scopeKeys) {
     let fn;
     try {
         const js = `return (${expression})`;
@@ -106,9 +83,18 @@ function createFunction(expression, scopeKeys) {
     }
     return fn;
 }
-exports.createFunction = createFunction;
-function _evaluateSimple(expression) {
-    const fn = createFunction(expression);
-    return fn();
-}
-//# sourceMappingURL=utils.js.map
+// export function evaluate(expression: string, scope?: object) {
+//   if (!scope) return _evaluateSimple(expression);
+//   const scopeKeys = Object.keys(scope);
+//   const scopeParams: any[] = [];
+//   for (let i = 0; i < scopeKeys.length; i++) {
+//     const key = scopeKeys[i];
+//     scopeParams.push(scope[key]);
+//   }
+//   const fn = createFunction(expression, scopeKeys);
+//   return fn(...scopeParams);
+// }
+// function _evaluateSimple(expression: string) {
+//   const fn = createFunction(expression);
+//   return fn();
+// }

package/package.json

@@ -1,34 +1,30 @@
 {
   "name": "@cabloy/utils",
-  "version": "1.0.3",
+  "type": "module",
+  "version": "1.0.5",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
   },
+  "author": "zhennann",
+  "keywords": [
+    "framework",
+    "cabloy"
+  ],
   "exports": {
     ".": {
       "types": [
-        "./dist/index.d.ts",
-        "./src/index.ts"
+        "./src/index.ts",
+        "./dist/index.d.ts"
       ],
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist"
   ],
-  "keywords": [
-    "egg",
-    "egg-born",
-    "framework",
-    "cabloy"
-  ],
-  "author": "zhennann",
-  "scripts": {
-    "lint": "eslint ."
+  "dependencies": {
+    "cel-js": "^0.3.1"
   }
 }