@cabloy/utils 2.0.17 → 2.0.19

package/dist/index.js

@@ -217,6 +217,7 @@ function combineQueries(pagePath, queries) {
 const PATH_PARAM_RE = /\{([^{}/]+)\}/g;
 const PATH_PARAM_RE2 = /:([^/]+)/g;
 function defaultPathSerializer(pathName, pathParams) {
+  if (!pathName) return undefined;
   pathParams = pathParams ?? {};
   for (const item of [PATH_PARAM_RE, PATH_PARAM_RE2]) {
     pathName = pathName.replace(item, (_, _part) => {
@@ -264,6 +265,20 @@ function forEachSync(arr, order, fn) {
   }
 }
 
+// for hold on CustomRefImpl
+function objectAssign(...args) {
+  const target = args[0];
+  for (let i = 1; i < args.length; i++) {
+    const source = args[i];
+    const keys = Object.getOwnPropertyNames(source);
+    for (const key of keys) {
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      target[key] = desc?.value;
+    }
+  }
+  return target;
+}
+
 const celEnvBase = new Environment({
   unlistedVariablesAreDyn: true,
   enableOptionalTypes: true,
@@ -496,4 +511,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, forEach, forEachSync, 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 };
+export { StringPrefixCel, StringPrefixRaw, StringPrefixRegexp, addLeadingSlash, catchError, catchErrorSync, cel, celEnvBase, checkMeta, combineApiPath, combineApiPathControllerAndAction, combineApiPathControllerAndActionRaw, combineParamsAndQuery, combineQueries, combineResourceName, combineResourceNameParts, createFunction, defaultPathSerializer, deprecated, ensureArray, evaluate, evaluateExpressions, evaluateSimple, forEach, forEachSync, getProperty, getPropertyObject, getRandomInt, hasProperty, hashkey, isClass, isClassStrict, isConstructor, isEmpty, isEmptyObject, isFunction, isNil, isNilOrEmptyString, isNumber, isObject, isPlainObject, isPromise, isString, isSymbol, isUndefined, matchSelector, normalizePath, objectAssign, parse, raw, regexp, replaceTemplate, safeBoolean, setProperty, sleep, stringLazy, stripEndSlash, zodCustomError };

package/dist/utils.d.ts

@@ -1,3 +1,7 @@
+export interface IParamsAndQuery {
+    params?: Record<string, any>;
+    query?: Record<string, any>;
+}
 export declare function deprecated(oldUsage: any, newUsage: any): void;
 export declare function catchError<T>(fnMethod: (...args: any[]) => Promise<T>): Promise<[T, undefined] | [undefined, Error]>;
 export declare function catchErrorSync<T>(fnMethod: (...args: any[]) => T): [T, undefined] | [undefined, Error];
@@ -8,15 +12,13 @@ export declare function hasProperty(obj: object | undefined, name: string, sep?:
 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;
-export declare function combineParamsAndQuery(path: string, options?: {
-    params?: object;
-    query?: object;
-}): string;
+export declare function combineParamsAndQuery(path?: string, options?: IParamsAndQuery): string;
 export declare function combineQueries(pagePath?: string, queries?: Record<string, any>): string;
-export declare function defaultPathSerializer(pathName: string, pathParams?: Record<string, any>): string;
+export declare function defaultPathSerializer<T extends string | undefined>(pathName?: T, pathParams?: Record<string, any>): T extends string ? string : undefined;
 export declare function ensureArray(arr: any, sep?: string): any[] | undefined;
 export declare function stringLazy(fn: () => string): {
     toString: () => string;
 };
 export declare function forEach<T>(arr: T[], order: boolean, fn: (item: T, index: number) => Promise<void>): Promise<void>;
 export declare function forEachSync<T>(arr: T[], order: boolean, fn: (item: T, index: number) => void): void;
+export declare function objectAssign<T = any>(...args: any[]): T;

package/package.json

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