@cabloy/utils 1.0.48 → 2.0.1

package/dist/celjs/base.d.ts

@@ -0,0 +1,2 @@
+import { Environment } from '@marcbachmann/cel-js';
+export declare const celEnvBase: Environment;

package/dist/celjs/evaluate.d.ts

@@ -0,0 +1,4 @@
+import type { Environment, ParseResult } from '@marcbachmann/cel-js';
+export declare function evaluateExpressions<T = any>(expressions: any, context?: object, celEnv?: Environment, dry?: boolean): T;
+export declare function evaluate<T = any>(expression: string, context?: object, celEnv?: Environment): T;
+export declare function parse(expression: string, celEnv?: Environment): ParseResult;

package/dist/celjs/index.d.ts

@@ -0,0 +1,4 @@
+export * from './base.ts';
+export * from './evaluate.ts';
+export * from './types.ts';
+export * from './utils.ts';

package/dist/celjs/utils.d.ts

@@ -0,0 +1,5 @@
+export declare function regexp(str: string): string;
+export declare function cel(str: string): string;
+export declare function raw(str: string): string;
+export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
+export declare function evaluateSimple(expression: string, scope?: object): any;

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-export * from './cel.ts';
+export * from './celjs/index.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';
 export * from './zod.ts';

package/dist/index.js

@@ -1,8 +1,428 @@
-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";
-export * from "./zod.js";
+import { Environment } from '@marcbachmann/cel-js';
+import objectHash from 'object-hash';
+import { toLowerCaseFirstChar, stringToCapitalize } from '@cabloy/word-utils';
+
+const isUndefined = obj => typeof obj === 'undefined';
+const isNil = val => isUndefined(val) || val === null;
+const isObject = fn => !isNil(fn) && typeof fn === 'object';
+function isEmptyObject(obj) {
+  if (!obj) return true;
+  return Object.keys(obj).length === 0;
+}
+function isPlainObject(fn) {
+  if (!isObject(fn)) {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(fn);
+  if (proto === null) {
+    return true;
+  }
+  const ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
+  return typeof ctor === 'function' && ctor instanceof ctor && Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object);
+}
+function addLeadingSlash(path) {
+  return path && typeof path === 'string' ? path.charAt(0) !== '/' ? `/${path}` : path : '';
+}
+function normalizePath(path) {
+  return path ? path.startsWith('/') ? `/${path.replace(/\/+$/, '')}`.replace(/\/+/g, '/') : `/${path.replace(/\/+$/, '')}` : '/';
+}
+const stripEndSlash = path => path[path.length - 1] === '/' ? path.slice(0, path.length - 1) : path;
+const isFunction = val => typeof val === 'function';
+const isString = val => typeof val === 'string';
+const isNumber = val => typeof val === 'number';
+const isConstructor = val => val === 'constructor';
+const isEmpty = array => !(array && array.length > 0);
+const isSymbol = val => typeof val === 'symbol';
+function isClass(fn) {
+  return typeof fn === 'function' && !!fn.name && fn.prototype?.constructor === fn;
+}
+function isClassStrict(fn) {
+  return typeof fn === 'function' && /^class(?:\s|\{)/.test(fn.toString());
+}
+function isPromise(obj) {
+  return obj instanceof Promise || obj && typeof obj.then === 'function';
+}
+function isNilOrEmptyString(str) {
+  return str === undefined || str === null || str === '';
+}
+function checkMeta(meta, data) {
+  // check none
+  if (!meta) return true;
+  // loop
+  for (const key in meta) {
+    const metaItem = meta[key];
+    if (isNil(metaItem)) continue;
+    if (!Array.isArray(metaItem) && metaItem !== data?.[key]) return false;
+    if (Array.isArray(metaItem) && !metaItem.includes(data?.[key])) return false;
+  }
+  // default
+  return true;
+}
+function safeBoolean(value) {
+  if (isNil(value) || value === 'false' || value === '0') return false;
+  return Boolean(value);
+}
+
+function deprecated(oldUsage, newUsage) {
+  const message = '`'.concat(oldUsage, '` is deprecated and will be removed in a later version. Use `').concat(newUsage, '` instead');
+  console.warn(message);
+}
+async function catchError(fnMethod) {
+  let error;
+  let data;
+  try {
+    data = await fnMethod();
+  } catch (err) {
+    error = err;
+  }
+  return error ? [undefined, error] : [data, undefined];
+}
+function catchErrorSync(fnMethod) {
+  let error;
+  let data;
+  try {
+    data = fnMethod();
+  } catch (err) {
+    error = err;
+  }
+  return error ? [undefined, error] : [data, undefined];
+}
+async function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+function replaceTemplate(content, scope) {
+  if (!content) return content;
+  return content.toString().replace(/(\\)?\{\{ *([\w.]+) *\}\}/g, (block, skip, key) => {
+    if (skip) {
+      return block.substring(skip.length);
+    }
+    const value = getProperty(scope, key);
+    return value !== undefined ? value : '';
+  });
+}
+function setProperty(obj, name, value) {
+  const names = name.split('.');
+  if (names.length === 1) {
+    obj[name] = value;
+  } else {
+    for (let i = 0; i < names.length - 1; i++) {
+      const _obj = obj[names[i]];
+      if (_obj) {
+        obj = _obj;
+      } else {
+        obj = obj[names[i]] = {};
+      }
+    }
+    obj[names[names.length - 1]] = value;
+  }
+}
+function getProperty(obj, name, sep) {
+  return _getProperty(obj, name, sep, false);
+}
+function getPropertyObject(obj, name, sep) {
+  return _getProperty(obj, name, sep, true);
+}
+const __keysIgnore = ['constructor', 'prototype', '__proto__'];
+function _getProperty(_obj, name, sep, forceObject) {
+  if (!_obj) return undefined;
+  let obj = _obj;
+  const names = name.split(sep || '.');
+  // loop
+  for (const _name of names) {
+    const [name, index] = _parsePropertyKey(_name);
+    if (__keysIgnore.includes(name)) throw new Error(`invalid prop: ${name}`);
+    if (obj[name] === undefined) {
+      // not check obj[name] === null
+      if (forceObject) {
+        if (index === undefined) {
+          obj[name] = {};
+        } else {
+          obj[name] = [];
+        }
+      } else {
+        obj = obj[name];
+        break;
+      }
+    }
+    obj = obj[name];
+    if (index !== undefined) {
+      obj = obj[index];
+    }
+  }
+  return obj;
+}
+function _parsePropertyKey(name) {
+  const matched = name.match(/([^[]+)\[(\d+)\]/);
+  if (!matched) return [name, undefined];
+  return [matched[1], Number.parseInt(matched[2])];
+}
+function getRandomInt(size, start = 0) {
+  return Math.floor(Math.random() * size) + start;
+}
+function combineParamsAndQuery(path, options) {
+  return combineQueries(defaultPathSerializer(path, options?.params), options?.query);
+}
+function combineQueries(pagePath, queries) {
+  pagePath = pagePath ?? '/';
+  //
+  if (!queries) return pagePath;
+  //
+  const query2 = [];
+  const parts = [];
+  if (queries) {
+    for (const key in queries) {
+      const value = queries[key];
+      if (isNil(value)) continue;
+      if (typeof value === 'object') {
+        query2.push([key, value]);
+      } else {
+        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+      }
+    }
+  }
+  // query2
+  for (const [key, value] of query2) {
+    parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`);
+  }
+  if (parts.length === 0) return pagePath;
+  //
+  const str = parts.join('&');
+  //
+  const pos = pagePath.indexOf('?');
+  if (pos === -1) return `${pagePath}?${str}`;
+  if (pos === pagePath.length - 1) return `${pagePath}${str}`;
+  return `${pagePath}&${str}`;
+}
+const PATH_PARAM_RE = /\{([^{}/]+)\}/g;
+const PATH_PARAM_RE2 = /:([^/]+)/g;
+function defaultPathSerializer(pathName, pathParams) {
+  pathParams = pathParams ?? {};
+  for (const item of [PATH_PARAM_RE, PATH_PARAM_RE2]) {
+    pathName = pathName.replace(item, (_, _part) => {
+      if (_part.includes('?')) _part = _part.substring(0, _part.length - 1);
+      const value = pathParams?.[_part];
+      if (value === undefined || value === null) return '';
+      if (typeof value === 'object') return encodeURIComponent(JSON.stringify(value));
+      return encodeURIComponent(value);
+    });
+  }
+  return pathName;
+}
+function ensureArray(arr, sep) {
+  if (arr === undefined || arr === null) return undefined;
+  if (arr === '') return [];
+  if (Array.isArray(arr)) return arr;
+  if (typeof arr === 'string' && sep !== null) return arr.split(sep ?? ',');
+  return [arr];
+}
+function stringLazy(fn) {
+  return {
+    toString: fn
+  };
+}
+
+const celEnvBase = new Environment({
+  unlistedVariablesAreDyn: true,
+  enableOptionalTypes: true,
+  homogeneousAggregateLiterals: false
+});
+const params = [];
+for (let i = 0; i < 10; i++) {
+  params.push('dyn');
+  celEnvBase.registerFunction(`concat(${params.join(',')}):list`, _concat);
+}
+celEnvBase.registerFunction('join(list):string', list => {
+  return _join(list);
+});
+celEnvBase.registerFunction('join(list,string):string', (list, sep) => {
+  return _join(list, sep);
+});
+celEnvBase.registerFunction('get(map,string):dyn', (obj, name) => {
+  return getProperty(obj, name);
+});
+celEnvBase.registerFunction('get(map,string,string):dyn', (obj, name, sep) => {
+  return getProperty(obj, name, sep);
+});
+celEnvBase.registerOperator('string + int', (str, n) => str + String(n));
+celEnvBase.registerOperator('int + string', (n, str) => String(n) + str);
+function _concat(...args) {
+  return [].concat(...args);
+}
+function _join(list, sep) {
+  if (!list) return '';
+  return list.join(sep);
+}
+
+const StringPrefixRegexp = 'regexp://';
+const StringPrefixCel = 'cel://';
+const StringPrefixRaw = 'raw://';
+
+function regexp(str) {
+  return `${StringPrefixRegexp}${str}`;
+}
+function cel(str) {
+  return `${StringPrefixCel}${str}`;
+}
+function raw(str) {
+  return `${StringPrefixRaw}${str}`;
+}
+function createFunction(expression, scopeKeys) {
+  let fn;
+  try {
+    const js = `return (${expression})`;
+    fn = scopeKeys && scopeKeys.length > 0 ? new Function(scopeKeys.join(','), js) : new Function(js);
+  } catch (_err) {
+    fn = scopeKeys && scopeKeys.length > 0 ? new Function(scopeKeys.join(','), expression) : new Function(expression);
+  }
+  return fn;
+}
+function evaluateSimple(expression, scope) {
+  const scopeKeys = scope ? Object.keys(scope) : undefined;
+  const scopeValues = scope ? Object.values(scope) : undefined;
+  const fn = createFunction(expression, scopeKeys);
+  return scopeValues ? fn(...scopeValues) : fn();
+}
+
+function evaluateExpressions(expressions, context, celEnv, dry) {
+  if (isNil(expressions)) return _returnExpressionWithDry(expressions, dry);
+  if (Array.isArray(expressions)) {
+    return expressions.map(item => _evaluateExpressionInner(item, context, celEnv, dry));
+  } else if (typeof expressions === 'object') {
+    const res = {};
+    for (const key in expressions) {
+      res[key] = _evaluateExpressionInner(expressions[key], context, celEnv, dry);
+    }
+    return res;
+  }
+  // others
+  return _evaluateExpressionInner(expressions, context, celEnv, dry);
+}
+function _evaluateExpressionInner(expression, context, celEnv, dry) {
+  if (isNil(expression)) return _returnExpressionWithDry(expression, dry);
+  if (typeof expression === 'object') return evaluateExpressions(expression, context, celEnv, dry);
+  if (typeof expression !== 'string') return _returnExpressionWithDry(expression, dry);
+  if (!expression.startsWith(StringPrefixCel)) return _returnExpressionWithDry(expression, dry);
+  return dry ? true : evaluate(expression.substring(StringPrefixCel.length), context, celEnv);
+}
+function _returnExpressionWithDry(expression, dry) {
+  return dry ? false : expression;
+}
+function evaluate(expression, context, celEnv) {
+  if (expression.startsWith(StringPrefixRaw)) {
+    return expression.substring(StringPrefixRaw.length);
+  } else if (expression.startsWith(StringPrefixRegexp)) {
+    return evaluateSimple(expression.substring(StringPrefixRegexp.length));
+  }
+  return (celEnv ?? celEnvBase).evaluate(expression, context);
+}
+function parse(expression, celEnv) {
+  return (celEnv ?? celEnvBase).parse(expression);
+}
+
+function hashkey(key) {
+  if (key === undefined || key === null) {
+    return '';
+  }
+  if (Array.isArray(key) || typeof key === 'object') {
+    return objectHash(key, {
+      respectType: false
+    });
+  }
+  if (typeof key !== 'string') {
+    return String(key);
+  }
+  return key;
+}
+
+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] && typeof matchArgs[0] === 'object' ? {
+        ...matchArgs[0]
+      } : matchArgs[0]
+    }) || 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));
+}
+
+function combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId) {
+  simplify = simplify ?? true;
+  simplifyProviderId = simplifyProviderId ?? true;
+  if (!resourceName) resourceName = '';
+  // module path + arg
+  if (typeof moduleName !== 'string') moduleName = moduleName.relativeName;
+  const parts = moduleName.split('-');
+  // path
+  const res = [];
+  if (!simplifyProviderId || parts[0] !== 'a') res.push(parts[0]);
+  if (!simplify || !resourceName.startsWith(parts[1])) res.push(parts[1]);
+  if (resourceName) res.push(resourceName);
+  return res;
+}
+function combineResourceName(resourceName, moduleName, simplify, simplifyProviderId) {
+  const parts = combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId);
+  return toLowerCaseFirstChar(stringToCapitalize(parts));
+}
+function combineApiPath(path, moduleName, prefix, simplify, globalPrefixConfig) {
+  const globalPrefix = typeof prefix === 'string' ? prefix : prefix === false ? '' : globalPrefixConfig;
+  simplify = simplify ?? true;
+  if (!path) path = '';
+  // ignore globalPrefix
+  if (path.startsWith('//')) return path.substring(1);
+  // ignore module path
+  if (path.startsWith('/')) return `${globalPrefix}${path}`;
+  // globalPrefix + module path + arg
+  const parts = combineResourceNameParts(path, moduleName ?? '', simplify, true);
+  return `${globalPrefix}/${parts.join('/')}`;
+}
+function combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, prefix, simplify, globalPrefixConfig) {
+  if (actionPath === undefined) actionPath = '';
+  // routePath
+  let routePath;
+  if (typeof actionPath !== 'string') {
+    // regexp
+    throw new TypeError('regexp not supported');
+  } else if (actionPath.startsWith('/')) {
+    // absolute
+    routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
+  } else {
+    // relative
+    if (!controllerPath) {
+      routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
+    } else {
+      routePath = combineApiPath(controllerPath, moduleName, prefix, simplify, globalPrefixConfig);
+      if (actionPath) {
+        routePath = `${routePath}/${actionPath}`;
+      }
+    }
+  }
+  return routePath;
+}
+function combineApiPathControllerAndActionRaw(moduleName, controllerPath, actionPath, simplify) {
+  let apiPath = combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, '/_api_', simplify);
+  if (typeof apiPath !== 'string') return apiPath;
+  if (apiPath.startsWith('/_api_')) {
+    apiPath = apiPath.substring('/_api_'.length);
+  } else {
+    apiPath = `/${apiPath}`;
+  }
+  return apiPath;
+}
+
+function zodCustomError(path, message) {
+  const error = new Error();
+  error.code = 422;
+  error.message = [{
+    code: 'custom',
+    path,
+    message
+  }];
+  return error;
+}
+
+export { StringPrefixCel, StringPrefixRaw, StringPrefixRegexp, addLeadingSlash, catchError, catchErrorSync, cel, celEnvBase, checkMeta, combineApiPath, combineApiPathControllerAndAction, combineApiPathControllerAndActionRaw, combineParamsAndQuery, combineQueries, combineResourceName, combineResourceNameParts, createFunction, defaultPathSerializer, deprecated, ensureArray, evaluate, evaluateExpressions, evaluateSimple, getProperty, getPropertyObject, getRandomInt, hashkey, isClass, isClassStrict, isConstructor, isEmpty, isEmptyObject, isFunction, isNil, isNilOrEmptyString, isNumber, isObject, isPlainObject, isPromise, isString, isSymbol, isUndefined, matchSelector, normalizePath, parse, raw, regexp, replaceTemplate, safeBoolean, setProperty, sleep, stringLazy, stripEndSlash, zodCustomError };

package/dist/utils.d.ts

@@ -6,8 +6,6 @@ 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 | undefined, name: string, sep?: string): T | undefined;
 export declare function getPropertyObject<T>(obj: object | undefined, name: string, sep?: string): T | undefined;
-export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
-export declare function evaluateSimple(expression: string, scope?: object): any;
 export declare function getRandomInt(size: number, start?: number): number;
 export declare function combineParamsAndQuery(path: string, options?: {
     params?: object;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.48",
+  "version": "2.0.1",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
@@ -25,16 +25,14 @@
     "dist"
   ],
   "dependencies": {
-    "@cabloy/cel-js": "^0.7.4",
-    "@cabloy/module-info": "^1.3.31",
+    "@cabloy/module-info": "^1.3.32",
     "@cabloy/word-utils": "^2.0.1",
-    "chevrotain": "^11.0.3",
+    "@marcbachmann/cel-js": "^6.4.0",
     "object-hash": "^3.0.0"
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "lint": "eslint .",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc"
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"
   }
 }

package/dist/cel.d.ts

@@ -1,5 +0,0 @@
-import type * as Celjs from '@cabloy/cel-js' with { 'resolution-mode': 'import' };
-import type { CstNode } from 'chevrotain';
-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,73 +0,0 @@
-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 function evaluateExpressions(expressions, context, functions, dry) {
-    if (isNil(expressions))
-        return _returnExpressionWithDry(expressions, dry);
-    if (Array.isArray(expressions)) {
-        return expressions.map(item => _evaluateExpressionInner(item, context, functions, dry));
-    }
-    else if (typeof expressions === 'object') {
-        const res = {};
-        for (const key in expressions) {
-            res[key] = _evaluateExpressionInner(expressions[key], context, functions, dry);
-        }
-        return res;
-    }
-    // others
-    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(StringPrefixCel))
-        return _returnExpressionWithDry(expression, dry);
-    return dry ? true : evaluate(expression.substring(StringPrefixCel.length), context, functions);
-}
-function _returnExpressionWithDry(expression, dry) {
-    return dry ? false : expression;
-}
-export function evaluate(expression, context, functions) {
-    // functions
-    functions = _prepareFunctions(functions);
-    // CstNode
-    if (typeof expression === 'object' && expression.children) {
-        return celjs.evaluate(expression, context, functions);
-    }
-    // string
-    if (typeof expression === 'string') {
-        if (expression.startsWith(StringPrefixRaw)) {
-            return expression.substring(StringPrefixRaw.length);
-        }
-        return celjs.evaluate(expression, context, functions);
-    }
-    // others
-    return expression;
-}
-export function parse(expression) {
-    return celjs.parse(expression);
-}
-function _prepareFunctions(functions) {
-    return Object.assign({
-        concat: (...args) => {
-            return [].concat(...args);
-        },
-        join: (arr, sep) => {
-            if (!arr)
-                return '';
-            return arr.join(sep);
-        },
-        get: (obj, name, sep) => {
-            return getProperty(obj, name, sep);
-        },
-        hashkey: (key) => {
-            return hashkey(key);
-        },
-    }, functions);
-}

package/dist/check.js

@@ -1,72 +0,0 @@
-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);
-    if (proto === null) {
-        return true;
-    }
-    const ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
-    return (typeof ctor === 'function' &&
-        ctor instanceof ctor &&
-        Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object));
-}
-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 isClass(fn) {
-    return typeof fn === 'function' && !!fn.name && fn.prototype?.constructor === fn;
-}
-export function isClassStrict(fn) {
-    return typeof fn === 'function' && /^class(?:\s|\{)/.test(fn.toString());
-}
-export function isPromise(obj) {
-    return obj instanceof Promise || (obj && typeof obj.then === 'function');
-}
-export function isNilOrEmptyString(str) {
-    return str === undefined || str === null || str === '';
-}
-export function checkMeta(meta, data) {
-    // check none
-    if (!meta)
-        return true;
-    // loop
-    for (const key in meta) {
-        const metaItem = meta[key];
-        if (isNil(metaItem))
-            continue;
-        if (!Array.isArray(metaItem) && metaItem !== data?.[key])
-            return false;
-        if (Array.isArray(metaItem) && !metaItem.includes(data?.[key]))
-            return false;
-    }
-    // default
-    return true;
-}
-export function safeBoolean(value) {
-    if (isNil(value) || value === 'false' || value === '0')
-        return false;
-    return Boolean(value);
-}

package/dist/hash.js

@@ -1,13 +0,0 @@
-import objectHash from 'object-hash';
-export function hashkey(key) {
-    if (key === undefined || key === null) {
-        return '';
-    }
-    if (Array.isArray(key) || typeof key === 'object') {
-        return objectHash(key, { respectType: false });
-    }
-    if (typeof key !== 'string') {
-        return String(key);
-    }
-    return key;
-}

package/dist/match.js

@@ -1,16 +0,0 @@
-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.js

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

package/dist/utils.js

@@ -1,196 +0,0 @@
-export function deprecated(oldUsage, newUsage) {
-    const message = '`'
-        .concat(oldUsage, '` is deprecated and will be removed in a later version. Use `')
-        .concat(newUsage, '` instead');
-    console.warn(message);
-}
-export async function catchError(fnMethod) {
-    let error;
-    let data;
-    try {
-        data = await fnMethod();
-    }
-    catch (err) {
-        error = err;
-    }
-    return error ? [undefined, error] : [data, undefined];
-}
-export function catchErrorSync(fnMethod) {
-    let error;
-    let data;
-    try {
-        data = fnMethod();
-    }
-    catch (err) {
-        error = err;
-    }
-    return error ? [undefined, error] : [data, undefined];
-}
-export async function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-export function replaceTemplate(content, scope) {
-    if (!content)
-        return content;
-    return content.toString().replace(/(\\)?\{\{ *([\w.]+) *\}\}/g, (block, skip, key) => {
-        if (skip) {
-            return block.substring(skip.length);
-        }
-        const value = getProperty(scope, key);
-        return value !== undefined ? value : '';
-    });
-}
-export function setProperty(obj, name, value) {
-    const names = name.split('.');
-    if (names.length === 1) {
-        obj[name] = value;
-    }
-    else {
-        for (let i = 0; i < names.length - 1; i++) {
-            const _obj = obj[names[i]];
-            if (_obj) {
-                obj = _obj;
-            }
-            else {
-                obj = obj[names[i]] = {};
-            }
-        }
-        obj[names[names.length - 1]] = value;
-    }
-}
-export function getProperty(obj, name, sep) {
-    return _getProperty(obj, name, sep, false);
-}
-export function getPropertyObject(obj, name, sep) {
-    return _getProperty(obj, name, sep, true);
-}
-const __keysIgnore = ['constructor', 'prototype', '__proto__'];
-function _getProperty(_obj, name, sep, forceObject) {
-    if (!_obj)
-        return undefined;
-    let obj = _obj;
-    const names = name.split(sep || '.');
-    // loop
-    for (const _name of names) {
-        const [name, index] = _parsePropertyKey(_name);
-        if (__keysIgnore.includes(name))
-            throw new Error(`invalid prop: ${name}`);
-        if (obj[name] === undefined) { // not check obj[name] === null
-            if (forceObject) {
-                if (index === undefined) {
-                    obj[name] = {};
-                }
-                else {
-                    obj[name] = [];
-                }
-            }
-            else {
-                obj = obj[name];
-                break;
-            }
-        }
-        obj = obj[name];
-        if (index !== undefined) {
-            obj = obj[index];
-        }
-    }
-    return obj;
-}
-function _parsePropertyKey(name) {
-    const matched = name.match((/([^[]+)\[(\d+)\]/));
-    if (!matched)
-        return [name, undefined];
-    return [matched[1], Number.parseInt(matched[2])];
-}
-export function createFunction(expression, scopeKeys) {
-    let fn;
-    try {
-        const js = `return (${expression})`;
-        fn = scopeKeys && scopeKeys.length > 0 ? new Function(scopeKeys.join(','), js) : new Function(js);
-    }
-    catch (_err) {
-        fn = scopeKeys && scopeKeys.length > 0 ? new Function(scopeKeys.join(','), expression) : new Function(expression);
-    }
-    return fn;
-}
-export function evaluateSimple(expression, scope) {
-    const scopeKeys = scope ? Object.keys(scope) : undefined;
-    const scopeValues = scope ? Object.values(scope) : undefined;
-    const fn = createFunction(expression, scopeKeys);
-    return scopeValues ? fn(...scopeValues) : fn();
-}
-export function getRandomInt(size, start = 0) {
-    return Math.floor(Math.random() * size) + start;
-}
-export function combineParamsAndQuery(path, options) {
-    return combineQueries(defaultPathSerializer(path, options?.params), options?.query);
-}
-export function combineQueries(pagePath, queries) {
-    pagePath = pagePath ?? '/';
-    //
-    if (!queries)
-        return pagePath;
-    //
-    const query2 = [];
-    const parts = [];
-    if (queries) {
-        for (const key in queries) {
-            const value = queries[key];
-            if (value && typeof value === 'object') {
-                query2.push([key, value]);
-            }
-            else {
-                parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
-            }
-        }
-    }
-    // query2
-    for (const [key, value] of query2) {
-        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`);
-    }
-    if (parts.length === 0)
-        return pagePath;
-    //
-    const str = parts.join('&');
-    //
-    const pos = pagePath.indexOf('?');
-    if (pos === -1)
-        return `${pagePath}?${str}`;
-    if (pos === pagePath.length - 1)
-        return `${pagePath}${str}`;
-    return `${pagePath}&${str}`;
-}
-const PATH_PARAM_RE = /\{([^{}/]+)\}/g;
-const PATH_PARAM_RE2 = /:([^/]+)/g;
-export function defaultPathSerializer(pathName, pathParams) {
-    pathParams = pathParams ?? {};
-    for (const item of [PATH_PARAM_RE, PATH_PARAM_RE2]) {
-        pathName = pathName.replace(item, (_, _part) => {
-            if (_part.includes('?'))
-                _part = _part.substring(0, _part.length - 1);
-            const value = pathParams?.[_part];
-            if (value === undefined || value === null)
-                return '';
-            if (typeof value === 'object')
-                return encodeURIComponent(JSON.stringify(value));
-            return encodeURIComponent(value);
-        });
-    }
-    return pathName;
-}
-export function ensureArray(arr, sep) {
-    if (arr === undefined || arr === null)
-        return undefined;
-    if (arr === '')
-        return [];
-    if (Array.isArray(arr))
-        return arr;
-    if (typeof arr === 'string' && sep !== null)
-        return arr.split(sep ?? ',');
-    return [arr];
-}
-export function stringLazy(fn) {
-    return {
-        toString: fn,
-    };
-}

package/dist/vona.js

@@ -1,78 +0,0 @@
-import { stringToCapitalize, toLowerCaseFirstChar } from '@cabloy/word-utils';
-export function combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId) {
-    simplify = simplify ?? true;
-    simplifyProviderId = simplifyProviderId ?? true;
-    if (!resourceName)
-        resourceName = '';
-    // module path + arg
-    if (typeof moduleName !== 'string')
-        moduleName = moduleName.relativeName;
-    const parts = moduleName.split('-');
-    // path
-    const res = [];
-    if (!simplifyProviderId || parts[0] !== 'a')
-        res.push(parts[0]);
-    if (!simplify || !resourceName.startsWith(parts[1]))
-        res.push(parts[1]);
-    if (resourceName)
-        res.push(resourceName);
-    return res;
-}
-export function combineResourceName(resourceName, moduleName, simplify, simplifyProviderId) {
-    const parts = combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId);
-    return toLowerCaseFirstChar(stringToCapitalize(parts));
-}
-export function combineApiPath(path, moduleName, prefix, simplify, globalPrefixConfig) {
-    const globalPrefix = typeof prefix === 'string' ? prefix : prefix === false ? '' : globalPrefixConfig;
-    simplify = simplify ?? true;
-    if (!path)
-        path = '';
-    // ignore globalPrefix
-    if (path.startsWith('//'))
-        return path.substring(1);
-    // ignore module path
-    if (path.startsWith('/'))
-        return `${globalPrefix}${path}`;
-    // globalPrefix + module path + arg
-    const parts = combineResourceNameParts(path, moduleName ?? '', simplify, true);
-    return `${globalPrefix}/${parts.join('/')}`;
-}
-export function combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, prefix, simplify, globalPrefixConfig) {
-    if (actionPath === undefined)
-        actionPath = '';
-    // routePath
-    let routePath;
-    if (typeof actionPath !== 'string') {
-        // regexp
-        throw new TypeError('regexp not supported');
-    }
-    else if (actionPath.startsWith('/')) {
-        // absolute
-        routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
-    }
-    else {
-        // relative
-        if (!controllerPath) {
-            routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
-        }
-        else {
-            routePath = combineApiPath(controllerPath, moduleName, prefix, simplify, globalPrefixConfig);
-            if (actionPath) {
-                routePath = `${routePath}/${actionPath}`;
-            }
-        }
-    }
-    return routePath;
-}
-export function combineApiPathControllerAndActionRaw(moduleName, controllerPath, actionPath, simplify) {
-    let apiPath = combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, '/_api_', simplify);
-    if (typeof apiPath !== 'string')
-        return apiPath;
-    if (apiPath.startsWith('/_api_')) {
-        apiPath = apiPath.substring('/_api_'.length);
-    }
-    else {
-        apiPath = `/${apiPath}`;
-    }
-    return apiPath;
-}

package/dist/zod.js

@@ -1,12 +0,0 @@
-export function zodCustomError(path, message) {
-    const error = new Error();
-    error.code = 422;
-    error.message = [
-        {
-            code: 'custom',
-            path,
-            message,
-        },
-    ];
-    return error;
-}