@trackunit/react-core-contexts-test 0.1.210 → 0.1.211

package/HookRenderer.cjs.js

@@ -12,8 +12,8 @@ require('@apollo/client/testing');
 require('@trackunit/react-core-contexts-api');
 require('@apollo/client/react');
 require('@tanstack/react-router');
-require('react');
 require('@trackunit/shared-utils');
+require('react');
 require('graphql');
 
 /**

package/HookRenderer.esm.js

@@ -10,8 +10,8 @@ import '@apollo/client/testing';
 import '@trackunit/react-core-contexts-api';
 import '@apollo/client/react';
 import '@tanstack/react-router';
-import 'react';
 import '@trackunit/shared-utils';
+import 'react';
 import 'graphql';
 
 /**

package/index.cjs.js

@@ -13,8 +13,8 @@ require('@apollo/client/testing');
 require('@trackunit/react-core-contexts-api');
 require('@apollo/client/react');
 require('@tanstack/react-router');
-require('react');
 require('@trackunit/shared-utils');
+require('react');
 require('graphql');
 
 

package/index.cjs2.js

@@ -10,8 +10,8 @@ var testing = require('@apollo/client/testing');
 var reactCoreContextsApi = require('@trackunit/react-core-contexts-api');
 var react = require('@apollo/client/react');
 var reactRouter = require('@tanstack/react-router');
-var React = require('react');
 var sharedUtils = require('@trackunit/shared-utils');
+var React = require('react');
 var graphql = require('graphql');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -231,7 +231,7 @@ const mockNavigationContext = {
 
 const mockOemBrandingContext = {
     getAllBrandingDetails: doNothing,
-    getOemBranding: doNothing,
+    getOemBranding: () => __awaiter(void 0, void 0, void 0, function* () { return null; }),
     getOemImage: doNothing,
 };
 
@@ -268,7 +268,10 @@ const buildFlatRouteMap = (routes) => {
  */
 const RootRouteDebugger = () => {
     // const matches = useMatches();
-    // console.log("matches", matches);
+    // console.log(
+    //   "matches",
+    //   matches.map(match => match.routeId)
+    // );
     return jsxRuntime.jsx(reactRouter.Outlet, {});
 };
 /**
@@ -294,14 +297,13 @@ const TestRenderChildren = ({ addTestRootContainer, children }) => {
  * @returns React.ReactElement
  */
 const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute, children, }) => {
+    var _a, _b;
     const client = react.useApolloClient();
-    const memoryHistory = React.useMemo(() => {
-        var _a, _b;
-        return reactRouter.createMemoryHistory({
-            initialEntries: (_b = (_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.map(entry => entry.path)) !== null && _b !== void 0 ? _b : ["/"],
-            initialIndex: 0,
-        });
-    }, [selectedRouterProps]);
+    // The current version of createMemoryHistory seem to have issues when NOT ending on / so adding a # will not effect what url is rendered but it seems to work
+    const memoryHistory = reactRouter.createMemoryHistory({
+        initialEntries: (_b = (_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.map(entry => entry.path + "#")) !== null && _b !== void 0 ? _b : ["/#"],
+        initialIndex: 0,
+    });
     const getChildren = React.useCallback(() => children, [children]);
     const router = React.useMemo(() => {
         var _a, _b;
@@ -310,20 +312,28 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
             const childRoute = reactRouter.createRoute({
                 path: "/",
                 getParentRoute: () => rootRoute,
-                component: () => (jsxRuntime.jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
+                component: () => {
+                    return jsxRuntime.jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() });
+                },
             });
             rootRoute.addChildren([childRoute]);
         }
         else {
             const pathsToRoute = buildFlatRouteMap([rootRoute]);
+            sharedUtils.objectValues(pathsToRoute).forEach(route => {
+                route.options.component = RootRouteDebugger;
+                route.lazyFn = undefined;
+            });
             if (pathsToRoute.__root__) {
-                pathsToRoute.__root__.options.component = () => jsxRuntime.jsx(RootRouteDebugger, {});
+                pathsToRoute.__root__.options.component = RootRouteDebugger;
+                pathsToRoute.__root__.options.beforeLoad = () => { };
+                pathsToRoute.__root__.lazyFn = undefined;
             }
             if (pathsToRoute["/"]) {
                 // This ensures / is not redirecting to default home route
                 pathsToRoute["/"].options.beforeLoad = () => { };
             }
-            if (((_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.length) || 0 > 0) {
+            if ((((_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.length) || 0) > 0) {
                 (_b = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _b === void 0 ? void 0 : _b.forEach(entry => {
                     const route = pathsToRoute[entry.route];
                     if (route) {
@@ -346,11 +356,7 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
                         path: "/",
                         getParentRoute: () => rootRoute,
                         component: () => (jsxRuntime.jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
-                    }).lazy(() => __awaiter(void 0, void 0, void 0, function* () {
-                        return reactRouter.createLazyRoute("/")({
-                            component: () => (jsxRuntime.jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
-                        });
-                    }));
+                    });
                     rootRoute.addChildren([childRoute]);
                 }
             }
@@ -371,8 +377,11 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
             },
         });
     }, [rootRoute]);
-    const context = React.useMemo(() => (Object.assign({ hasAccessTo: () => __awaiter(void 0, void 0, void 0, function* () { return true; }), isAuthenticated: true, client, defaultUserRoute: "/" }, ((selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context) || {}))), [client]);
-    return jsxRuntime.jsx(reactRouter.RouterProvider, { context: context, router: router });
+    const context = React.useMemo(() => (Object.assign({ hasAccessTo: () => __awaiter(void 0, void 0, void 0, function* () { return true; }), isAuthenticated: true, client, defaultUserRoute: "/" }, ((selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context) || {}))), [client, selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context]);
+    const ErrorComponent = ({ error, info }) => {
+        return jsxRuntime.jsxs(jsxRuntime.Fragment, { children: ["UNCAUGHT ERROR IN TEST: ", error === null || error === void 0 ? void 0 : error.message] });
+    };
+    return jsxRuntime.jsx(reactRouter.RouterProvider, { context: context, defaultErrorComponent: ErrorComponent, router: router });
 };
 
 /**

package/index.esm.js

@@ -9,6 +9,6 @@ import '@apollo/client/testing';
 import '@trackunit/react-core-contexts-api';
 import '@apollo/client/react';
 import '@tanstack/react-router';
-import 'react';
 import '@trackunit/shared-utils';
+import 'react';
 import 'graphql';

package/index.esm2.js

@@ -1,4 +1,4 @@
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { act, render } from '@testing-library/react';
 import { CurrentUserProvider, AnalyticsContext, UserSubscriptionProvider, OemBrandingContextProvider, TokenProvider, ToastProvider, ConfirmationDialogProvider, FilterBarProvider, AssetSortingProvider, NavigationContextProvider, CurrentUserPreferenceProvider, EnvironmentContextProvider } from '@trackunit/react-core-hooks';
 import omit from 'lodash/omit';
@@ -7,9 +7,9 @@ import { onError } from '@apollo/client/link/error';
 import { MockLink, MockedProvider } from '@apollo/client/testing';
 import { AssetSortByProperty, SortOrder } from '@trackunit/react-core-contexts-api';
 import { useApolloClient } from '@apollo/client/react';
-import { createMemoryHistory, createRootRoute, createRoute, createLazyRoute, createRouter, RouterProvider, Outlet } from '@tanstack/react-router';
-import React, { useMemo, useCallback, useRef, useEffect } from 'react';
-import { objectKeys } from '@trackunit/shared-utils';
+import { createMemoryHistory, createRootRoute, createRoute, createRouter, RouterProvider, Outlet } from '@tanstack/react-router';
+import { objectValues, objectKeys } from '@trackunit/shared-utils';
+import React, { useCallback, useMemo, useRef, useEffect } from 'react';
 import { GraphQLError } from 'graphql';
 
 /******************************************************************************
@@ -224,7 +224,7 @@ const mockNavigationContext = {
 
 const mockOemBrandingContext = {
     getAllBrandingDetails: doNothing,
-    getOemBranding: doNothing,
+    getOemBranding: () => __awaiter(void 0, void 0, void 0, function* () { return null; }),
     getOemImage: doNothing,
 };
 
@@ -261,7 +261,10 @@ const buildFlatRouteMap = (routes) => {
  */
 const RootRouteDebugger = () => {
     // const matches = useMatches();
-    // console.log("matches", matches);
+    // console.log(
+    //   "matches",
+    //   matches.map(match => match.routeId)
+    // );
     return jsx(Outlet, {});
 };
 /**
@@ -287,14 +290,13 @@ const TestRenderChildren = ({ addTestRootContainer, children }) => {
  * @returns React.ReactElement
  */
 const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute, children, }) => {
+    var _a, _b;
     const client = useApolloClient();
-    const memoryHistory = useMemo(() => {
-        var _a, _b;
-        return createMemoryHistory({
-            initialEntries: (_b = (_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.map(entry => entry.path)) !== null && _b !== void 0 ? _b : ["/"],
-            initialIndex: 0,
-        });
-    }, [selectedRouterProps]);
+    // The current version of createMemoryHistory seem to have issues when NOT ending on / so adding a # will not effect what url is rendered but it seems to work
+    const memoryHistory = createMemoryHistory({
+        initialEntries: (_b = (_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.map(entry => entry.path + "#")) !== null && _b !== void 0 ? _b : ["/#"],
+        initialIndex: 0,
+    });
     const getChildren = useCallback(() => children, [children]);
     const router = useMemo(() => {
         var _a, _b;
@@ -303,20 +305,28 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
             const childRoute = createRoute({
                 path: "/",
                 getParentRoute: () => rootRoute,
-                component: () => (jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
+                component: () => {
+                    return jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() });
+                },
             });
             rootRoute.addChildren([childRoute]);
         }
         else {
             const pathsToRoute = buildFlatRouteMap([rootRoute]);
+            objectValues(pathsToRoute).forEach(route => {
+                route.options.component = RootRouteDebugger;
+                route.lazyFn = undefined;
+            });
             if (pathsToRoute.__root__) {
-                pathsToRoute.__root__.options.component = () => jsx(RootRouteDebugger, {});
+                pathsToRoute.__root__.options.component = RootRouteDebugger;
+                pathsToRoute.__root__.options.beforeLoad = () => { };
+                pathsToRoute.__root__.lazyFn = undefined;
             }
             if (pathsToRoute["/"]) {
                 // This ensures / is not redirecting to default home route
                 pathsToRoute["/"].options.beforeLoad = () => { };
             }
-            if (((_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.length) || 0 > 0) {
+            if ((((_a = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _a === void 0 ? void 0 : _a.length) || 0) > 0) {
                 (_b = selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.initialEntries) === null || _b === void 0 ? void 0 : _b.forEach(entry => {
                     const route = pathsToRoute[entry.route];
                     if (route) {
@@ -339,11 +349,7 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
                         path: "/",
                         getParentRoute: () => rootRoute,
                         component: () => (jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
-                    }).lazy(() => __awaiter(void 0, void 0, void 0, function* () {
-                        return createLazyRoute("/")({
-                            component: () => (jsx(TestRenderChildren, { addTestRootContainer: addTestRootContainer, children: getChildren() })),
-                        });
-                    }));
+                    });
                     rootRoute.addChildren([childRoute]);
                 }
             }
@@ -364,8 +370,11 @@ const RouterContainer = ({ addTestRootContainer, selectedRouterProps, rootRoute,
             },
         });
     }, [rootRoute]);
-    const context = useMemo(() => (Object.assign({ hasAccessTo: () => __awaiter(void 0, void 0, void 0, function* () { return true; }), isAuthenticated: true, client, defaultUserRoute: "/" }, ((selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context) || {}))), [client]);
-    return jsx(RouterProvider, { context: context, router: router });
+    const context = useMemo(() => (Object.assign({ hasAccessTo: () => __awaiter(void 0, void 0, void 0, function* () { return true; }), isAuthenticated: true, client, defaultUserRoute: "/" }, ((selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context) || {}))), [client, selectedRouterProps === null || selectedRouterProps === void 0 ? void 0 : selectedRouterProps.context]);
+    const ErrorComponent = ({ error, info }) => {
+        return jsxs(Fragment, { children: ["UNCAUGHT ERROR IN TEST: ", error === null || error === void 0 ? void 0 : error.message] });
+    };
+    return jsx(RouterProvider, { context: context, defaultErrorComponent: ErrorComponent, router: router });
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-core-contexts-test",
-  "version": "0.1.210",
+  "version": "0.1.211",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -14,7 +14,7 @@
     "@trackunit/react-core-hooks": "*",
     "lodash": "4.17.21",
     "graphql": "^15.8.0",
-    "@tanstack/react-router": "1.19.1",
+    "@tanstack/react-router": "1.31.6",
     "@trackunit/shared-utils": "*"
   },
   "module": "./index.esm.js",