@cabloy/utils 2.0.4 → 2.0.6

package/dist/index.js

@@ -116,6 +116,9 @@ function setProperty(obj, name, value) {
     obj[names[names.length - 1]] = value;
   }
 }
+function hasProperty(obj, name, sep) {
+  return _hasProperty(obj, name, sep);
+}
 function getProperty(obj, name, sep) {
   return _getProperty(obj, name, sep, false);
 }
@@ -123,6 +126,24 @@ function getPropertyObject(obj, name, sep) {
   return _getProperty(obj, name, sep, true);
 }
 const __keysIgnore = ['constructor', 'prototype', '__proto__'];
+function _hasProperty(_obj, name, sep) {
+  if (!_obj) return false;
+  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 === undefined || !Object.hasOwnProperty.call(obj, name)) {
+      return false;
+    }
+    obj = obj[name];
+    if (index !== undefined) {
+      obj = obj[index];
+    }
+  }
+  return true;
+}
 function _getProperty(_obj, name, sep, forceObject) {
   if (!_obj) return undefined;
   let obj = _obj;
@@ -240,14 +261,6 @@ celEnvBase.registerFunction('join(list,string):string', (list, sep) => {
   return _join(list, sep);
 });
 
-// get
-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);
-});
-
 // string
 celEnvBase.registerFunction('string(null):string', value => {
   return String(value);
@@ -256,11 +269,27 @@ celEnvBase.registerFunction('string(null):string', value => {
 // operator: +
 celEnvBase.registerOperator('string + int', (str, n) => str + String(n));
 celEnvBase.registerOperator('int + string', (n, str) => String(n) + str);
+celEnvBase.registerOperator('string + null', (str, _n) => str);
+celEnvBase.registerOperator('null + string', (_n, str) => str);
 
 // operator: ==
 celEnvBase.registerOperator('string == null', (str, n) => str === n);
 celEnvBase.registerOperator('int == null', (num, n) => num === n);
 celEnvBase.registerOperator('bool == null', (b, n) => b === n);
+
+// get
+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.registerFunction('exists(null,string):bool', (obj, name) => {
+  return hasProperty(obj, name);
+});
+celEnvBase.registerFunction('exists(map,string):bool', (obj, name) => {
+  return hasProperty(obj, name);
+});
 function _concat(...args) {
   return [].concat(...args);
 }
@@ -441,4 +470,4 @@ function zodCustomError(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 };
+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, hasProperty, 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

@@ -4,6 +4,7 @@ export declare function catchErrorSync<T>(fnMethod: (...args: any[]) => T): [T,
 export declare function sleep(ms: any): Promise<unknown>;
 export declare function replaceTemplate(content: string, scope: object): string;
 export declare function setProperty<T>(obj: object, name: string, value: T): void;
+export declare function hasProperty(obj: object | undefined, name: string, sep?: string): boolean;
 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 getRandomInt(size: number, start?: number): number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"