fix: rollback util and add param

Author: mananjadhav

src/libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute.ts

@@ -5,15 +5,26 @@ import isDynamicRouteSuffix from './isDynamicRouteSuffix';
 import splitPathAndQuery from './splitPathAndQuery';
 
 /**
- * Merges two query strings into one. If both contain the same key, an error is thrown.
+ * Merges two query strings into one. If both contain the same key,
+ * the error is thrown.
+ * @param baseQuery - The query string of the base path
+ * @param suffixQuery - The query string of the suffix
+ * @returns The merged query string or an empty string if both are empty
+ *
+ * @private - Internal helper. Do not export or use outside this file.
+ *
+ * @example
+ * mergeQueryStrings('foo=bar', 'foo=baz') => '?foo=bar&baz=qux'
+ * mergeQueryStrings('foo=bar', 'foo=baz') => throws an error
  */
 const mergeQueryStrings = (baseQuery = '', suffixQuery = ''): string => {
     if (!baseQuery && !suffixQuery) {
         return '';
     }
     const params = new URLSearchParams(baseQuery);
     const suffixParams = new URLSearchParams(suffixQuery);
-    for (const [key, value] of suffixParams.entries()) {
+    const suffixParamsEntries = suffixParams.entries();
+    for (const [key, value] of suffixParamsEntries) {
         if (params.has(key)) {
             throw new Error(`[createDynamicRoute] Query param "${key}" exists in both base path and dynamic suffix. This is not allowed.`);
         }
@@ -23,7 +34,33 @@ const mergeQueryStrings = (baseQuery = '', suffixQuery = ''): string => {
     return result ? `?${result}` : '';
 };
 
-/** Adds dynamic route name (with optional query params) to the current URL and returns it */
+/**
+ * Combines a base path with a dynamic route suffix, merging their query parameters.
+ *
+ * @private - Internal helper. Do not export or use outside this file.
+ */
+const combinePathAndSuffix = (basePath: string, suffixWithQuery: string): Route => {
+    const [normalizedBasePath, baseQuery] = splitPathAndQuery(basePath);
+    const [suffixPath, suffixQuery] = splitPathAndQuery(suffixWithQuery);
+
+    if (!normalizedBasePath) {
+        Log.warn('[createDynamicRoute.ts] Path is undefined or empty, returning suffix only', {basePath, suffixWithQuery});
+        return suffixWithQuery as Route;
+    }
+
+    const combinedPath = normalizedBasePath === '/' ? `/${suffixPath}` : `${normalizedBasePath}/${suffixPath}`;
+    const mergedQuery = mergeQueryStrings(baseQuery, suffixQuery);
+
+    return `${combinedPath}${mergedQuery}` as Route;
+};
+
+/** Adds dynamic route name (with optional query params) to the current URL and returns it 
+ *
+ * @param dynamicRouteSuffixWithParams - The dynamic route suffix with optional query params
+ * @param basePath - The base path to use for the dynamic route
+ *
+ * @returns The combined dynamic route path and query string 
+*/
 const createDynamicRoute = (dynamicRouteSuffixWithParams: string, basePath?: string): Route => {
     const [suffixPath] = splitPathAndQuery(dynamicRouteSuffixWithParams);
 
@@ -32,17 +69,7 @@ const createDynamicRoute = (dynamicRouteSuffixWithParams: string, basePath?: str
     }
 
     const routePath = basePath ?? Navigation.getActiveRoute();
-    const [normalizedBasePath, baseQuery] = splitPathAndQuery(routePath);
-    const [normalizedSuffixPath, suffixQuery] = splitPathAndQuery(dynamicRouteSuffixWithParams);
-
-    if (!normalizedBasePath) {
-        Log.warn('[createDynamicRoute.ts] Path is undefined or empty, returning suffix only', {basePath: routePath, suffixWithQuery: dynamicRouteSuffixWithParams});
-        return dynamicRouteSuffixWithParams as Route;
-    }
-
-    const combinedPath = normalizedBasePath === '/' ? `/${normalizedSuffixPath}` : `${normalizedBasePath}/${normalizedSuffixPath}`;
-    const mergedQuery = mergeQueryStrings(baseQuery, suffixQuery);
-
-    return `${combinedPath}${mergedQuery}` as Route;
+    return combinePathAndSuffix(routePath, dynamicRouteSuffixWithParams);
 };
+
 export default createDynamicRoute;