@safaricom-mxl/web-sdk 0.0.7 → 0.0.8

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.cjs

@@ -10,17 +10,18 @@ const require_instrumentations_navigation_NavigationInstrumentation_instance = r
 *
 * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.
 */
-const getRouteFromMatches = (matches, currentPathname) => matches.filter((m) => currentPathname.includes(m.pathname)).reduce((route, match) => {
-	if (!match.route.path) return route;
-	if (route) return {
-		url: match.pathname,
-		path: `${route.path}/${match.route.path}`
-	};
-	return {
-		url: match.pathname,
-		path: match.route.path
-	};
-}, null);
+const getRouteFromMatches = (matches, currentPathname) => {
+	const currentMatchIndex = matches.findIndex((match) => match.pathname === currentPathname);
+	if (currentMatchIndex === -1 || !matches[currentMatchIndex].route.path) return null;
+	return matches.slice(0, currentMatchIndex + 1).reduce((acc, match) => {
+		const routePath = match.route.path;
+		if (!routePath) return acc;
+		return {
+			path: routePath.startsWith("/") ? routePath : `${acc?.path ?? ""}/${routePath}`,
+			url: matches[currentMatchIndex].pathname
+		};
+	}, null);
+};
 const listenToRouterChanges = ({ router, routesMatcher, config: { pathnameDocument = window.location } = {} }) => {
 	const navigationInstrumentation = require_instrumentations_navigation_NavigationInstrumentation_instance.getNavigationInstrumentation();
 	navigationInstrumentation.setInstrumentationType(require_constants_attributes.MXL_NAVIGATION_INSTRUMENTATIONS.Data);

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"listenToRouterChanges.cjs","names":["getNavigationInstrumentation","MXL_NAVIGATION_INSTRUMENTATIONS"],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"sourcesContent":["import type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { ListenToRouterChangesArgs, Match } from './types.ts';\n\n/**\n * getRouteFromMatches goes through all the matches routes to build the full path\n * nested routes contain only the partial match, so we need to go through all of them\n * in order to build the full path.\n *\n * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.\n */\nconst getRouteFromMatches = (\n  matches: Match[],\n  currentPathname: string,\n): Route | null =>\n  matches\n    .filter((m) => currentPathname.includes(m.pathname))\n    .reduce<null | Route>((route, match) => {\n      if (!match.route.path) {\n        return route;\n      }\n\n      if (route) {\n        return {\n          url: match.pathname,\n          path: `${route.path}/${match.route.path}`,\n        } as Route;\n      }\n\n      return {\n        url: match.pathname,\n        path: match.route.path,\n      } as Route;\n    }, null);\n\nexport const listenToRouterChanges = ({\n  router,\n  routesMatcher,\n  config: { pathnameDocument = window.location } = {},\n}: ListenToRouterChangesArgs) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Data,\n  );\n\n  const initialMatches = routesMatcher(router.routes, {\n    pathname: pathnameDocument.pathname,\n  });\n\n  const initialRoute = initialMatches\n    ? getRouteFromMatches(initialMatches, pathnameDocument.pathname)\n    : null;\n\n  if (initialRoute) {\n    navigationInstrumentation.setCurrentRoute(initialRoute);\n  }\n\n  return router.subscribe((state) => {\n    // State has a list of already matched routes\n    // https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/router/router.ts#L954\n    const currentRoute = getRouteFromMatches(\n      state.matches,\n      state.location.pathname,\n    );\n\n    if (currentRoute) {\n      navigationInstrumentation.setCurrentRoute(currentRoute);\n    }\n  });\n};\n"],"mappings":";;;;;;;;;;;;AAYA,MAAM,uBACJ,SACA,oBAEA,QACG,QAAQ,MAAM,gBAAgB,SAAS,EAAE,SAAS,CAAC,CACnD,QAAsB,OAAO,UAAU;AACtC,KAAI,CAAC,MAAM,MAAM,KACf,QAAO;AAGT,KAAI,MACF,QAAO;EACL,KAAK,MAAM;EACX,MAAM,GAAG,MAAM,KAAK,GAAG,MAAM,MAAM;EACpC;AAGH,QAAO;EACL,KAAK,MAAM;EACX,MAAM,MAAM,MAAM;EACnB;GACA,KAAK;AAEZ,MAAa,yBAAyB,EACpC,QACA,eACA,QAAQ,EAAE,mBAAmB,OAAO,aAAa,EAAE,OACpB;CAC/B,MAAM,4BAA4BA,qGAA8B;AAChE,2BAA0B,uBACxBC,6DAAgC,KACjC;CAED,MAAM,iBAAiB,cAAc,OAAO,QAAQ,EAClD,UAAU,iBAAiB,UAC5B,CAAC;CAEF,MAAM,eAAe,iBACjB,oBAAoB,gBAAgB,iBAAiB,SAAS,GAC9D;AAEJ,KAAI,aACF,2BAA0B,gBAAgB,aAAa;AAGzD,QAAO,OAAO,WAAW,UAAU;EAGjC,MAAM,eAAe,oBACnB,MAAM,SACN,MAAM,SAAS,SAChB;AAED,MAAI,aACF,2BAA0B,gBAAgB,aAAa;GAEzD"}
+{"version":3,"file":"listenToRouterChanges.cjs","names":["getNavigationInstrumentation","MXL_NAVIGATION_INSTRUMENTATIONS"],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"sourcesContent":["import type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { ListenToRouterChangesArgs, Match } from './types.ts';\n\n/**\n * getRouteFromMatches goes through all the matches routes to build the full path\n * nested routes contain only the partial match, so we need to go through all of them\n * in order to build the full path.\n *\n * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.\n */\nconst getRouteFromMatches = (\n  matches: Match[],\n  currentPathname: string,\n): Route | null => {\n  const currentMatchIndex = matches.findIndex(\n    (match) => match.pathname === currentPathname,\n  );\n\n  if (currentMatchIndex === -1 || !matches[currentMatchIndex].route.path) {\n    return null;\n  }\n\n  // Build full absolute path by reducing all matches up to the current one.\n  // Absolute child paths reset the accumulation; relative paths are appended.\n  return matches\n    .slice(0, currentMatchIndex + 1)\n    .reduce<Route | null>((acc, match) => {\n      const routePath = match.route.path;\n\n      if (!routePath) {\n        return acc;\n      }\n\n      // If the route path starts with '/', it's an absolute path and should reset the accumulated path.\n      // Otherwise, it's a relative path and should be appended to the accumulated path.\n      const path = routePath.startsWith('/')\n        ? routePath\n        : `${acc?.path ?? ''}/${routePath}`;\n\n      return { path, url: matches[currentMatchIndex].pathname };\n    }, null);\n};\n\nexport const listenToRouterChanges = ({\n  router,\n  routesMatcher,\n  config: { pathnameDocument = window.location } = {},\n}: ListenToRouterChangesArgs) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Data,\n  );\n\n  const initialMatches = routesMatcher(router.routes, {\n    pathname: pathnameDocument.pathname,\n  });\n\n  const initialRoute = initialMatches\n    ? getRouteFromMatches(initialMatches, pathnameDocument.pathname)\n    : null;\n\n  if (initialRoute) {\n    navigationInstrumentation.setCurrentRoute(initialRoute);\n  }\n\n  return router.subscribe((state) => {\n    // State has a list of already matched routes\n    // https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/router/router.ts#L954\n    const currentRoute = getRouteFromMatches(\n      state.matches,\n      state.location.pathname,\n    );\n\n    if (currentRoute) {\n      navigationInstrumentation.setCurrentRoute(currentRoute);\n    }\n  });\n};\n"],"mappings":";;;;;;;;;;;;AAYA,MAAM,uBACJ,SACA,oBACiB;CACjB,MAAM,oBAAoB,QAAQ,WAC/B,UAAU,MAAM,aAAa,gBAC/B;AAED,KAAI,sBAAsB,MAAM,CAAC,QAAQ,mBAAmB,MAAM,KAChE,QAAO;AAKT,QAAO,QACJ,MAAM,GAAG,oBAAoB,EAAE,CAC/B,QAAsB,KAAK,UAAU;EACpC,MAAM,YAAY,MAAM,MAAM;AAE9B,MAAI,CAAC,UACH,QAAO;AAST,SAAO;GAAE,MAJI,UAAU,WAAW,IAAI,GAClC,YACA,GAAG,KAAK,QAAQ,GAAG,GAAG;GAEX,KAAK,QAAQ,mBAAmB;GAAU;IACxD,KAAK;;AAGZ,MAAa,yBAAyB,EACpC,QACA,eACA,QAAQ,EAAE,mBAAmB,OAAO,aAAa,EAAE,OACpB;CAC/B,MAAM,4BAA4BA,qGAA8B;AAChE,2BAA0B,uBACxBC,6DAAgC,KACjC;CAED,MAAM,iBAAiB,cAAc,OAAO,QAAQ,EAClD,UAAU,iBAAiB,UAC5B,CAAC;CAEF,MAAM,eAAe,iBACjB,oBAAoB,gBAAgB,iBAAiB,SAAS,GAC9D;AAEJ,KAAI,aACF,2BAA0B,gBAAgB,aAAa;AAGzD,QAAO,OAAO,WAAW,UAAU;EAGjC,MAAM,eAAe,oBACnB,MAAM,SACN,MAAM,SAAS,SAChB;AAED,MAAI,aACF,2BAA0B,gBAAgB,aAAa;GAEzD"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"listenToRouterChanges.d.cts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"mappings":";;;cAoCa,qBAAA;EAAyB,MAAA;EAAA,aAAA;EAAA,MAAA;IAAA;EAAA;AAAA,GAInC,yBAAA"}
+{"version":3,"file":"listenToRouterChanges.d.cts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"mappings":";;;cA6Ca,qBAAA;EAAyB,MAAA;EAAA,aAAA;EAAA,MAAA;IAAA;EAAA;AAAA,GAInC,yBAAA"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listenToRouterChanges.d.ts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"mappings":";;;cAoCa,qBAAA;EAAyB,MAAA;EAAA,aAAA;EAAA,MAAA;IAAA;EAAA;AAAA,GAInC,yBAAA"}
+{"version":3,"file":"listenToRouterChanges.d.ts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"mappings":";;;cA6Ca,qBAAA;EAAyB,MAAA;EAAA,aAAA;EAAA,MAAA;IAAA;EAAA;AAAA,GAInC,yBAAA"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.js

@@ -9,17 +9,18 @@ import { getNavigationInstrumentation } from "../../instance.js";
 *
 * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.
 */
-const getRouteFromMatches = (matches, currentPathname) => matches.filter((m) => currentPathname.includes(m.pathname)).reduce((route, match) => {
-	if (!match.route.path) return route;
-	if (route) return {
-		url: match.pathname,
-		path: `${route.path}/${match.route.path}`
-	};
-	return {
-		url: match.pathname,
-		path: match.route.path
-	};
-}, null);
+const getRouteFromMatches = (matches, currentPathname) => {
+	const currentMatchIndex = matches.findIndex((match) => match.pathname === currentPathname);
+	if (currentMatchIndex === -1 || !matches[currentMatchIndex].route.path) return null;
+	return matches.slice(0, currentMatchIndex + 1).reduce((acc, match) => {
+		const routePath = match.route.path;
+		if (!routePath) return acc;
+		return {
+			path: routePath.startsWith("/") ? routePath : `${acc?.path ?? ""}/${routePath}`,
+			url: matches[currentMatchIndex].pathname
+		};
+	}, null);
+};
 const listenToRouterChanges = ({ router, routesMatcher, config: { pathnameDocument = window.location } = {} }) => {
 	const navigationInstrumentation = getNavigationInstrumentation();
 	navigationInstrumentation.setInstrumentationType(MXL_NAVIGATION_INSTRUMENTATIONS.Data);

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.js.map

@@ -1 +1 @@
-{"version":3,"file":"listenToRouterChanges.js","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"sourcesContent":["import type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { ListenToRouterChangesArgs, Match } from './types.ts';\n\n/**\n * getRouteFromMatches goes through all the matches routes to build the full path\n * nested routes contain only the partial match, so we need to go through all of them\n * in order to build the full path.\n *\n * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.\n */\nconst getRouteFromMatches = (\n  matches: Match[],\n  currentPathname: string,\n): Route | null =>\n  matches\n    .filter((m) => currentPathname.includes(m.pathname))\n    .reduce<null | Route>((route, match) => {\n      if (!match.route.path) {\n        return route;\n      }\n\n      if (route) {\n        return {\n          url: match.pathname,\n          path: `${route.path}/${match.route.path}`,\n        } as Route;\n      }\n\n      return {\n        url: match.pathname,\n        path: match.route.path,\n      } as Route;\n    }, null);\n\nexport const listenToRouterChanges = ({\n  router,\n  routesMatcher,\n  config: { pathnameDocument = window.location } = {},\n}: ListenToRouterChangesArgs) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Data,\n  );\n\n  const initialMatches = routesMatcher(router.routes, {\n    pathname: pathnameDocument.pathname,\n  });\n\n  const initialRoute = initialMatches\n    ? getRouteFromMatches(initialMatches, pathnameDocument.pathname)\n    : null;\n\n  if (initialRoute) {\n    navigationInstrumentation.setCurrentRoute(initialRoute);\n  }\n\n  return router.subscribe((state) => {\n    // State has a list of already matched routes\n    // https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/router/router.ts#L954\n    const currentRoute = getRouteFromMatches(\n      state.matches,\n      state.location.pathname,\n    );\n\n    if (currentRoute) {\n      navigationInstrumentation.setCurrentRoute(currentRoute);\n    }\n  });\n};\n"],"mappings":";;;;;;;;;;;AAYA,MAAM,uBACJ,SACA,oBAEA,QACG,QAAQ,MAAM,gBAAgB,SAAS,EAAE,SAAS,CAAC,CACnD,QAAsB,OAAO,UAAU;AACtC,KAAI,CAAC,MAAM,MAAM,KACf,QAAO;AAGT,KAAI,MACF,QAAO;EACL,KAAK,MAAM;EACX,MAAM,GAAG,MAAM,KAAK,GAAG,MAAM,MAAM;EACpC;AAGH,QAAO;EACL,KAAK,MAAM;EACX,MAAM,MAAM,MAAM;EACnB;GACA,KAAK;AAEZ,MAAa,yBAAyB,EACpC,QACA,eACA,QAAQ,EAAE,mBAAmB,OAAO,aAAa,EAAE,OACpB;CAC/B,MAAM,4BAA4B,8BAA8B;AAChE,2BAA0B,uBACxB,gCAAgC,KACjC;CAED,MAAM,iBAAiB,cAAc,OAAO,QAAQ,EAClD,UAAU,iBAAiB,UAC5B,CAAC;CAEF,MAAM,eAAe,iBACjB,oBAAoB,gBAAgB,iBAAiB,SAAS,GAC9D;AAEJ,KAAI,aACF,2BAA0B,gBAAgB,aAAa;AAGzD,QAAO,OAAO,WAAW,UAAU;EAGjC,MAAM,eAAe,oBACnB,MAAM,SACN,MAAM,SAAS,SAChB;AAED,MAAI,aACF,2BAA0B,gBAAgB,aAAa;GAEzD"}
+{"version":3,"file":"listenToRouterChanges.js","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Data/listenToRouterChanges.ts"],"sourcesContent":["import type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { ListenToRouterChangesArgs, Match } from './types.ts';\n\n/**\n * getRouteFromMatches goes through all the matches routes to build the full path\n * nested routes contain only the partial match, so we need to go through all of them\n * in order to build the full path.\n *\n * Filtering by currentPathname ensures that we only consider routes that are relevant to the current URL.\n */\nconst getRouteFromMatches = (\n  matches: Match[],\n  currentPathname: string,\n): Route | null => {\n  const currentMatchIndex = matches.findIndex(\n    (match) => match.pathname === currentPathname,\n  );\n\n  if (currentMatchIndex === -1 || !matches[currentMatchIndex].route.path) {\n    return null;\n  }\n\n  // Build full absolute path by reducing all matches up to the current one.\n  // Absolute child paths reset the accumulation; relative paths are appended.\n  return matches\n    .slice(0, currentMatchIndex + 1)\n    .reduce<Route | null>((acc, match) => {\n      const routePath = match.route.path;\n\n      if (!routePath) {\n        return acc;\n      }\n\n      // If the route path starts with '/', it's an absolute path and should reset the accumulated path.\n      // Otherwise, it's a relative path and should be appended to the accumulated path.\n      const path = routePath.startsWith('/')\n        ? routePath\n        : `${acc?.path ?? ''}/${routePath}`;\n\n      return { path, url: matches[currentMatchIndex].pathname };\n    }, null);\n};\n\nexport const listenToRouterChanges = ({\n  router,\n  routesMatcher,\n  config: { pathnameDocument = window.location } = {},\n}: ListenToRouterChangesArgs) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Data,\n  );\n\n  const initialMatches = routesMatcher(router.routes, {\n    pathname: pathnameDocument.pathname,\n  });\n\n  const initialRoute = initialMatches\n    ? getRouteFromMatches(initialMatches, pathnameDocument.pathname)\n    : null;\n\n  if (initialRoute) {\n    navigationInstrumentation.setCurrentRoute(initialRoute);\n  }\n\n  return router.subscribe((state) => {\n    // State has a list of already matched routes\n    // https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/router/router.ts#L954\n    const currentRoute = getRouteFromMatches(\n      state.matches,\n      state.location.pathname,\n    );\n\n    if (currentRoute) {\n      navigationInstrumentation.setCurrentRoute(currentRoute);\n    }\n  });\n};\n"],"mappings":";;;;;;;;;;;AAYA,MAAM,uBACJ,SACA,oBACiB;CACjB,MAAM,oBAAoB,QAAQ,WAC/B,UAAU,MAAM,aAAa,gBAC/B;AAED,KAAI,sBAAsB,MAAM,CAAC,QAAQ,mBAAmB,MAAM,KAChE,QAAO;AAKT,QAAO,QACJ,MAAM,GAAG,oBAAoB,EAAE,CAC/B,QAAsB,KAAK,UAAU;EACpC,MAAM,YAAY,MAAM,MAAM;AAE9B,MAAI,CAAC,UACH,QAAO;AAST,SAAO;GAAE,MAJI,UAAU,WAAW,IAAI,GAClC,YACA,GAAG,KAAK,QAAQ,GAAG,GAAG;GAEX,KAAK,QAAQ,mBAAmB;GAAU;IACxD,KAAK;;AAGZ,MAAa,yBAAyB,EACpC,QACA,eACA,QAAQ,EAAE,mBAAmB,OAAO,aAAa,EAAE,OACpB;CAC/B,MAAM,4BAA4B,8BAA8B;AAChE,2BAA0B,uBACxB,gCAAgC,KACjC;CAED,MAAM,iBAAiB,cAAc,OAAO,QAAQ,EAClD,UAAU,iBAAiB,UAC5B,CAAC;CAEF,MAAM,eAAe,iBACjB,oBAAoB,gBAAgB,iBAAiB,SAAS,GAC9D;AAEJ,KAAI,aACF,2BAA0B,gBAAgB,aAAa;AAGzD,QAAO,OAAO,WAAW,UAAU;EAGjC,MAAM,eAAe,oBACnB,MAAM,SACN,MAAM,SAAS,SAChB;AAED,MAAI,aACF,2BAA0B,gBAAgB,aAAa;GAEzD"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.cjs

@@ -9,7 +9,8 @@ hoist_non_react_statics = require_runtime.__toESM(hoist_non_react_statics);
 //#region src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts
 const getLastRoute = (matchedComponent, lastRoute) => {
 	if (!matchedComponent.props.match || !matchedComponent.props.match.route) return null;
-	const path = lastRoute ? `${lastRoute.path}/${matchedComponent.props.match.route.path}` : matchedComponent.props.match.route.path;
+	const childPath = matchedComponent.props.match.route.path;
+	const path = lastRoute && !childPath.startsWith("/") ? `${lastRoute.path}/${childPath}` : childPath;
 	if (matchedComponent.props.routeContext?.outlet) return getLastRoute(matchedComponent.props.routeContext.outlet, {
 		path,
 		url: matchedComponent.props.match.pathname

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"withMXLRouting.cjs","names":["getNavigationInstrumentation","MXL_NAVIGATION_INSTRUMENTATIONS"],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type React from 'react';\nimport { createElement } from 'react';\nimport type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { RoutesFunctionalComponentReturn } from './types.ts';\n\n// Routes can be nested, we need to traverse the routeContext to find the last route\nconst getLastRoute = (\n  matchedComponent: RoutesFunctionalComponentReturn,\n  lastRoute: Route | null,\n): Route | null => {\n  if (!matchedComponent.props.match || !matchedComponent.props.match.route) {\n    return null;\n  }\n\n  const path = lastRoute\n    ? `${lastRoute.path}/${matchedComponent.props.match.route.path}`\n    : matchedComponent.props.match.route.path;\n\n  if (matchedComponent.props.routeContext?.outlet) {\n    return getLastRoute(matchedComponent.props.routeContext.outlet, {\n      path,\n      url: matchedComponent.props.match.pathname,\n    });\n  }\n\n  return {\n    path,\n    url: matchedComponent.props.match.pathname,\n  };\n};\n\nexport const withMXLRouting = <P extends object>(\n  WrappedComponent: React.FunctionComponent<P>,\n) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Declarative,\n  );\n\n  const RoutesWithMXLRouting: React.FC<P> = (props: P) => {\n    /**\n     * React-router v6+ implementation is very different from v5\n     * It doesn't have a <Switch> component that injects props into <Route>\n     * Instead, it has <Routes> which internally calculates the matched route\n     * and returns it as a children, <Route> cannot be wrapped since it requires all children to be a <Route> component\n     * here we rely on that matching to get the current route.\n     * It's not ideal to rely on internal implementation details, but it's the easier way of getting the current route\n     * without having to manually match it or using hooks on each children component\n     *\n     * See: https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/hooks.tsx#L553\n     */\n    const matchedComponent = WrappedComponent(\n      props,\n    ) as unknown as RoutesFunctionalComponentReturn;\n\n    if (matchedComponent.props.match?.route) {\n      const lastRoute = getLastRoute(matchedComponent, null);\n      if (lastRoute) {\n        navigationInstrumentation.setCurrentRoute(lastRoute);\n      }\n    }\n\n    return createElement<P>(WrappedComponent, props);\n  };\n\n  // Keep wrapped component metadata\n  RoutesWithMXLRouting.displayName = `withMXLRouting(${WrappedComponent.displayName || WrappedComponent.name || 'Component'})`;\n  hoistNonReactStatics(RoutesWithMXLRouting, WrappedComponent);\n\n  return RoutesWithMXLRouting;\n};\n"],"mappings":";;;;;;;;;AASA,MAAM,gBACJ,kBACA,cACiB;AACjB,KAAI,CAAC,iBAAiB,MAAM,SAAS,CAAC,iBAAiB,MAAM,MAAM,MACjE,QAAO;CAGT,MAAM,OAAO,YACT,GAAG,UAAU,KAAK,GAAG,iBAAiB,MAAM,MAAM,MAAM,SACxD,iBAAiB,MAAM,MAAM,MAAM;AAEvC,KAAI,iBAAiB,MAAM,cAAc,OACvC,QAAO,aAAa,iBAAiB,MAAM,aAAa,QAAQ;EAC9D;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC,CAAC;AAGJ,QAAO;EACL;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC;;AAGH,MAAa,kBACX,qBACG;CACH,MAAM,4BAA4BA,qGAA8B;AAChE,2BAA0B,uBACxBC,6DAAgC,YACjC;CAED,MAAM,wBAAqC,UAAa;;;;;;;;;;;;EAYtD,MAAM,mBAAmB,iBACvB,MACD;AAED,MAAI,iBAAiB,MAAM,OAAO,OAAO;GACvC,MAAM,YAAY,aAAa,kBAAkB,KAAK;AACtD,OAAI,UACF,2BAA0B,gBAAgB,UAAU;;AAIxD,kCAAwB,kBAAkB,MAAM;;AAIlD,sBAAqB,cAAc,kBAAkB,iBAAiB,eAAe,iBAAiB,QAAQ,YAAY;AAC1H,sCAAqB,sBAAsB,iBAAiB;AAE5D,QAAO"}
+{"version":3,"file":"withMXLRouting.cjs","names":["getNavigationInstrumentation","MXL_NAVIGATION_INSTRUMENTATIONS"],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type React from 'react';\nimport { createElement } from 'react';\nimport type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { RoutesFunctionalComponentReturn } from './types.ts';\n\n// Routes can be nested, we need to traverse the routeContext to find the last route\nconst getLastRoute = (\n  matchedComponent: RoutesFunctionalComponentReturn,\n  lastRoute: Route | null,\n): Route | null => {\n  if (!matchedComponent.props.match || !matchedComponent.props.match.route) {\n    return null;\n  }\n\n  const childPath = matchedComponent.props.match.route.path;\n  const path =\n    lastRoute && !childPath.startsWith('/')\n      ? `${lastRoute.path}/${childPath}`\n      : childPath;\n\n  if (matchedComponent.props.routeContext?.outlet) {\n    return getLastRoute(matchedComponent.props.routeContext.outlet, {\n      path,\n      url: matchedComponent.props.match.pathname,\n    });\n  }\n\n  return {\n    path,\n    url: matchedComponent.props.match.pathname,\n  };\n};\n\nexport const withMXLRouting = <P extends object>(\n  WrappedComponent: React.FunctionComponent<P>,\n) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Declarative,\n  );\n\n  const RoutesWithMXLRouting: React.FC<P> = (props: P) => {\n    /**\n     * React-router v6+ implementation is very different from v5\n     * It doesn't have a <Switch> component that injects props into <Route>\n     * Instead, it has <Routes> which internally calculates the matched route\n     * and returns it as a children, <Route> cannot be wrapped since it requires all children to be a <Route> component\n     * here we rely on that matching to get the current route.\n     * It's not ideal to rely on internal implementation details, but it's the easier way of getting the current route\n     * without having to manually match it or using hooks on each children component\n     *\n     * See: https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/hooks.tsx#L553\n     */\n    const matchedComponent = WrappedComponent(\n      props,\n    ) as unknown as RoutesFunctionalComponentReturn;\n\n    if (matchedComponent.props.match?.route) {\n      const lastRoute = getLastRoute(matchedComponent, null);\n      if (lastRoute) {\n        navigationInstrumentation.setCurrentRoute(lastRoute);\n      }\n    }\n\n    return createElement<P>(WrappedComponent, props);\n  };\n\n  // Keep wrapped component metadata\n  RoutesWithMXLRouting.displayName = `withMXLRouting(${WrappedComponent.displayName || WrappedComponent.name || 'Component'})`;\n  hoistNonReactStatics(RoutesWithMXLRouting, WrappedComponent);\n\n  return RoutesWithMXLRouting;\n};\n"],"mappings":";;;;;;;;;AASA,MAAM,gBACJ,kBACA,cACiB;AACjB,KAAI,CAAC,iBAAiB,MAAM,SAAS,CAAC,iBAAiB,MAAM,MAAM,MACjE,QAAO;CAGT,MAAM,YAAY,iBAAiB,MAAM,MAAM,MAAM;CACrD,MAAM,OACJ,aAAa,CAAC,UAAU,WAAW,IAAI,GACnC,GAAG,UAAU,KAAK,GAAG,cACrB;AAEN,KAAI,iBAAiB,MAAM,cAAc,OACvC,QAAO,aAAa,iBAAiB,MAAM,aAAa,QAAQ;EAC9D;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC,CAAC;AAGJ,QAAO;EACL;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC;;AAGH,MAAa,kBACX,qBACG;CACH,MAAM,4BAA4BA,qGAA8B;AAChE,2BAA0B,uBACxBC,6DAAgC,YACjC;CAED,MAAM,wBAAqC,UAAa;;;;;;;;;;;;EAYtD,MAAM,mBAAmB,iBACvB,MACD;AAED,MAAI,iBAAiB,MAAM,OAAO,OAAO;GACvC,MAAM,YAAY,aAAa,kBAAkB,KAAK;AACtD,OAAI,UACF,2BAA0B,gBAAgB,UAAU;;AAIxD,kCAAwB,kBAAkB,MAAM;;AAIlD,sBAAqB,cAAc,kBAAkB,iBAAiB,eAAe,iBAAiB,QAAQ,YAAY;AAC1H,sCAAqB,sBAAsB,iBAAiB;AAE5D,QAAO"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"withMXLRouting.d.cts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"mappings":";;;cAkCa,cAAA,qBACX,gBAAA,EAAkB,KAAA,CAAM,iBAAA,CAAkB,CAAA,MAAE,KAAA,CAAA,EAAA,CAAA,CAAA"}
+{"version":3,"file":"withMXLRouting.d.cts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"mappings":";;;cAoCa,cAAA,qBACX,gBAAA,EAAkB,KAAA,CAAM,iBAAA,CAAkB,CAAA,MAAE,KAAA,CAAA,EAAA,CAAA,CAAA"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMXLRouting.d.ts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"mappings":";;;cAkCa,cAAA,qBACX,gBAAA,EAAkB,KAAA,CAAM,iBAAA,CAAkB,CAAA,MAAE,KAAA,CAAA,EAAA,CAAA,CAAA"}
+{"version":3,"file":"withMXLRouting.d.ts","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"mappings":";;;cAoCa,cAAA,qBACX,gBAAA,EAAkB,KAAA,CAAM,iBAAA,CAAkB,CAAA,MAAE,KAAA,CAAA,EAAA,CAAA,CAAA"}

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.js

@@ -6,7 +6,8 @@ import hoistNonReactStatics from "hoist-non-react-statics";
 //#region src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts
 const getLastRoute = (matchedComponent, lastRoute) => {
 	if (!matchedComponent.props.match || !matchedComponent.props.match.route) return null;
-	const path = lastRoute ? `${lastRoute.path}/${matchedComponent.props.match.route.path}` : matchedComponent.props.match.route.path;
+	const childPath = matchedComponent.props.match.route.path;
+	const path = lastRoute && !childPath.startsWith("/") ? `${lastRoute.path}/${childPath}` : childPath;
 	if (matchedComponent.props.routeContext?.outlet) return getLastRoute(matchedComponent.props.routeContext.outlet, {
 		path,
 		url: matchedComponent.props.match.pathname

package/dist/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.js.map

@@ -1 +1 @@
-{"version":3,"file":"withMXLRouting.js","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type React from 'react';\nimport { createElement } from 'react';\nimport type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { RoutesFunctionalComponentReturn } from './types.ts';\n\n// Routes can be nested, we need to traverse the routeContext to find the last route\nconst getLastRoute = (\n  matchedComponent: RoutesFunctionalComponentReturn,\n  lastRoute: Route | null,\n): Route | null => {\n  if (!matchedComponent.props.match || !matchedComponent.props.match.route) {\n    return null;\n  }\n\n  const path = lastRoute\n    ? `${lastRoute.path}/${matchedComponent.props.match.route.path}`\n    : matchedComponent.props.match.route.path;\n\n  if (matchedComponent.props.routeContext?.outlet) {\n    return getLastRoute(matchedComponent.props.routeContext.outlet, {\n      path,\n      url: matchedComponent.props.match.pathname,\n    });\n  }\n\n  return {\n    path,\n    url: matchedComponent.props.match.pathname,\n  };\n};\n\nexport const withMXLRouting = <P extends object>(\n  WrappedComponent: React.FunctionComponent<P>,\n) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Declarative,\n  );\n\n  const RoutesWithMXLRouting: React.FC<P> = (props: P) => {\n    /**\n     * React-router v6+ implementation is very different from v5\n     * It doesn't have a <Switch> component that injects props into <Route>\n     * Instead, it has <Routes> which internally calculates the matched route\n     * and returns it as a children, <Route> cannot be wrapped since it requires all children to be a <Route> component\n     * here we rely on that matching to get the current route.\n     * It's not ideal to rely on internal implementation details, but it's the easier way of getting the current route\n     * without having to manually match it or using hooks on each children component\n     *\n     * See: https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/hooks.tsx#L553\n     */\n    const matchedComponent = WrappedComponent(\n      props,\n    ) as unknown as RoutesFunctionalComponentReturn;\n\n    if (matchedComponent.props.match?.route) {\n      const lastRoute = getLastRoute(matchedComponent, null);\n      if (lastRoute) {\n        navigationInstrumentation.setCurrentRoute(lastRoute);\n      }\n    }\n\n    return createElement<P>(WrappedComponent, props);\n  };\n\n  // Keep wrapped component metadata\n  RoutesWithMXLRouting.displayName = `withMXLRouting(${WrappedComponent.displayName || WrappedComponent.name || 'Component'})`;\n  hoistNonReactStatics(RoutesWithMXLRouting, WrappedComponent);\n\n  return RoutesWithMXLRouting;\n};\n"],"mappings":";;;;;;AASA,MAAM,gBACJ,kBACA,cACiB;AACjB,KAAI,CAAC,iBAAiB,MAAM,SAAS,CAAC,iBAAiB,MAAM,MAAM,MACjE,QAAO;CAGT,MAAM,OAAO,YACT,GAAG,UAAU,KAAK,GAAG,iBAAiB,MAAM,MAAM,MAAM,SACxD,iBAAiB,MAAM,MAAM,MAAM;AAEvC,KAAI,iBAAiB,MAAM,cAAc,OACvC,QAAO,aAAa,iBAAiB,MAAM,aAAa,QAAQ;EAC9D;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC,CAAC;AAGJ,QAAO;EACL;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC;;AAGH,MAAa,kBACX,qBACG;CACH,MAAM,4BAA4B,8BAA8B;AAChE,2BAA0B,uBACxB,gCAAgC,YACjC;CAED,MAAM,wBAAqC,UAAa;;;;;;;;;;;;EAYtD,MAAM,mBAAmB,iBACvB,MACD;AAED,MAAI,iBAAiB,MAAM,OAAO,OAAO;GACvC,MAAM,YAAY,aAAa,kBAAkB,KAAK;AACtD,OAAI,UACF,2BAA0B,gBAAgB,UAAU;;AAIxD,SAAO,cAAiB,kBAAkB,MAAM;;AAIlD,sBAAqB,cAAc,kBAAkB,iBAAiB,eAAe,iBAAiB,QAAQ,YAAY;AAC1H,sBAAqB,sBAAsB,iBAAiB;AAE5D,QAAO"}
+{"version":3,"file":"withMXLRouting.js","names":[],"sources":["../../../../../../src/instrumentations/navigation/NavigationInstrumentation/react/reactRouterV6Declarative/withMXLRouting.ts"],"sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type React from 'react';\nimport { createElement } from 'react';\nimport type { Route } from '../../../../../api-page/index.ts';\nimport { MXL_NAVIGATION_INSTRUMENTATIONS } from '../../../../../constants/index.ts';\nimport { getNavigationInstrumentation } from '../../index.ts';\nimport type { RoutesFunctionalComponentReturn } from './types.ts';\n\n// Routes can be nested, we need to traverse the routeContext to find the last route\nconst getLastRoute = (\n  matchedComponent: RoutesFunctionalComponentReturn,\n  lastRoute: Route | null,\n): Route | null => {\n  if (!matchedComponent.props.match || !matchedComponent.props.match.route) {\n    return null;\n  }\n\n  const childPath = matchedComponent.props.match.route.path;\n  const path =\n    lastRoute && !childPath.startsWith('/')\n      ? `${lastRoute.path}/${childPath}`\n      : childPath;\n\n  if (matchedComponent.props.routeContext?.outlet) {\n    return getLastRoute(matchedComponent.props.routeContext.outlet, {\n      path,\n      url: matchedComponent.props.match.pathname,\n    });\n  }\n\n  return {\n    path,\n    url: matchedComponent.props.match.pathname,\n  };\n};\n\nexport const withMXLRouting = <P extends object>(\n  WrappedComponent: React.FunctionComponent<P>,\n) => {\n  const navigationInstrumentation = getNavigationInstrumentation();\n  navigationInstrumentation.setInstrumentationType(\n    MXL_NAVIGATION_INSTRUMENTATIONS.Declarative,\n  );\n\n  const RoutesWithMXLRouting: React.FC<P> = (props: P) => {\n    /**\n     * React-router v6+ implementation is very different from v5\n     * It doesn't have a <Switch> component that injects props into <Route>\n     * Instead, it has <Routes> which internally calculates the matched route\n     * and returns it as a children, <Route> cannot be wrapped since it requires all children to be a <Route> component\n     * here we rely on that matching to get the current route.\n     * It's not ideal to rely on internal implementation details, but it's the easier way of getting the current route\n     * without having to manually match it or using hooks on each children component\n     *\n     * See: https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/hooks.tsx#L553\n     */\n    const matchedComponent = WrappedComponent(\n      props,\n    ) as unknown as RoutesFunctionalComponentReturn;\n\n    if (matchedComponent.props.match?.route) {\n      const lastRoute = getLastRoute(matchedComponent, null);\n      if (lastRoute) {\n        navigationInstrumentation.setCurrentRoute(lastRoute);\n      }\n    }\n\n    return createElement<P>(WrappedComponent, props);\n  };\n\n  // Keep wrapped component metadata\n  RoutesWithMXLRouting.displayName = `withMXLRouting(${WrappedComponent.displayName || WrappedComponent.name || 'Component'})`;\n  hoistNonReactStatics(RoutesWithMXLRouting, WrappedComponent);\n\n  return RoutesWithMXLRouting;\n};\n"],"mappings":";;;;;;AASA,MAAM,gBACJ,kBACA,cACiB;AACjB,KAAI,CAAC,iBAAiB,MAAM,SAAS,CAAC,iBAAiB,MAAM,MAAM,MACjE,QAAO;CAGT,MAAM,YAAY,iBAAiB,MAAM,MAAM,MAAM;CACrD,MAAM,OACJ,aAAa,CAAC,UAAU,WAAW,IAAI,GACnC,GAAG,UAAU,KAAK,GAAG,cACrB;AAEN,KAAI,iBAAiB,MAAM,cAAc,OACvC,QAAO,aAAa,iBAAiB,MAAM,aAAa,QAAQ;EAC9D;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC,CAAC;AAGJ,QAAO;EACL;EACA,KAAK,iBAAiB,MAAM,MAAM;EACnC;;AAGH,MAAa,kBACX,qBACG;CACH,MAAM,4BAA4B,8BAA8B;AAChE,2BAA0B,uBACxB,gCAAgC,YACjC;CAED,MAAM,wBAAqC,UAAa;;;;;;;;;;;;EAYtD,MAAM,mBAAmB,iBACvB,MACD;AAED,MAAI,iBAAiB,MAAM,OAAO,OAAO;GACvC,MAAM,YAAY,aAAa,kBAAkB,KAAK;AACtD,OAAI,UACF,2BAA0B,gBAAgB,UAAU;;AAIxD,SAAO,cAAiB,kBAAkB,MAAM;;AAIlD,sBAAqB,cAAc,kBAAkB,iBAAiB,eAAe,iBAAiB,QAAQ,YAAY;AAC1H,sBAAqB,sBAAsB,iBAAiB;AAE5D,QAAO"}