@pinnacle0/react-stack-router - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

dist/component/Stack/index.js

@@ -30,5 +30,5 @@ import { jsx as _jsx } from "react/jsx-runtime";
                             ? { transition: "none" }
-                            : undefined, enter: () => screen.transition.enteringKeyframes, exit: () => screen.transition.exitingKeyframes, onEntering: () => screen.lifecycle.trigger("willEnter"), onEntered: () => screen.lifecycle.trigger("didEnter"), onExiting: () => screen.lifecycle.trigger("willExit"), onExited: () => screen.lifecycle.trigger("didExit"), children: _jsx(RouteContext.Provider, { value: context, children: _jsx(screen.content, { ...context }) }) }, screen.location.state.$key));
+                            : undefined, enter: () => screen.transition.enteringKeyframes, exit: () => screen.transition.exitingKeyframes, onEntering: () => screen.lifecycle.trigger("willEnter"), onEntered: () => screen.lifecycle.trigger("didEnter"), onExiting: () => screen.lifecycle.trigger("willExit"), onExited: () => screen.lifecycle.trigger("didExit"), children: _jsx(RouteContext.Provider, { value: context, children: _jsx(screen.content, { ...context }) }) }, screen.location.key));
             }) }) }));
 }
 //# sourceMappingURL=index.js.map

dist/stackRouter/index.d.ts

@@ -42,3 +42,3 @@ import { Route } from "../route";
     private getTopScreen;
-    private matchedRoute;
+    private validateRoute;
     private createScreen;
@@ -45,0 +45,0 @@ private pushScreen;

dist/stackRouter/index.js

@@ -29,7 +29,6 @@ import { Action } from "history";
         const defaultState = this.stackHistory.location.state;
-        const matched = this.matchedRoute(pathname);
-        invariant(matched, `StackRouter.initialize(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        const matchedRoute = this.validateRoute(pathname);
         const stack = [{ pathname, hash, search }];
-        const segments = ["/", ...matched.matchedSegments];
-        let currentParent = matched.payload.parent;
+        const segments = ["/", ...matchedRoute.matchedSegments];
+        let currentParent = matchedRoute.payload.parent;
         while (currentParent !== null && segments.length >= 0) {
@@ -70,4 +69,3 @@ const pathname = formatPath(segments.join("/"));
         }
-        const pathname = typeof to === "string" ? to : to.pathname;
-        invariant(this.matchedRoute(to), `StackRouter.push(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        this.validateRoute(to);
         this.pushOption.value = option ?? null;
@@ -99,4 +97,3 @@ const wait = new Promise(resolve => (this.resolve.value = resolve));
         }
-        const pathname = typeof to === "string" ? to : to.pathname;
-        invariant(this.matchedRoute(to), `StackRouter.replace(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        this.validateRoute(to);
         this.stackHistory.replace(to, { $key: this.stackHistory.location.state?.$key ?? createKey(), ...(option?.state ?? {}) });
@@ -129,14 +126,14 @@ }
     }
-    matchedRoute(to) {
+    validateRoute(to) {
         const pathname = typeof to === "string" ? to : to.pathname;
         const matched = this.route.lookup(pathname ?? window.location.pathname);
+        invariant(matched, `None of the route match current pathname: ${pathname}. Please make sure you have defined fallback route using "**"`);
         return matched;
     }
     createScreen(location, transitionOption) {
-        const matched = this.matchedRoute(location.pathname);
-        invariant(matched, `StackRouter.createScreen(): None of the route match current pathname:${location.pathname}. Please make sure you have defined fallback route using "**"`);
+        const matchedRoute = this.validateRoute(location.pathname);
         return new Screen({
-            content: matched.payload.component,
+            content: matchedRoute.payload.component,
             location,
-            params: matched.params,
+            params: matchedRoute.params,
             searchParams: Object.fromEntries(new URLSearchParams(location.search)),
@@ -143,0 +140,0 @@ transition: {

package.json

 {
   "name": "@pinnacle0/react-stack-router",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "Pinnacle",
@@ -26,3 +26,3 @@ "license": "MIT",
   "engines": {
-    "node": ">= 16.15.0"
+    "node": ">=18"
   },
@@ -34,8 +34,8 @@ "dependencies": {
   "devDependencies": {
-    "@types/react": "18.2.48",
-    "@types/react-dom": "18.2.18",
+    "@types/react": "18.3.2",
+    "@types/react-dom": "18.3.0",
     "copyfiles": "2.4.1",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "@pinnacle0/devtool-util": "1.2.9"
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "@pinnacle0/devtool-util": "1.2.13"
   },
@@ -42,0 +42,0 @@ "peerDependencies": {

src/stackRouter/index.ts

@@ -63,9 +63,8 @@ import {Action} from "history";
         const defaultState = this.stackHistory.location.state;
-        const matched = this.matchedRoute(pathname);
-        invariant(matched, `StackRouter.initialize(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        const matchedRoute = this.validateRoute(pathname);
 
         const stack: To[] = [{pathname, hash, search}];
-        const segments = ["/", ...matched.matchedSegments];
+        const segments = ["/", ...matchedRoute.matchedSegments];
 
-        let currentParent = matched.payload.parent;
+        let currentParent = matchedRoute.payload.parent;
         while (currentParent !== null && segments.length >= 0) {
@@ -114,4 +113,3 @@ const pathname = formatPath(segments.join("/"));
 
-        const pathname = typeof to === "string" ? to : to.pathname;
-        invariant(this.matchedRoute(to), `StackRouter.push(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        this.validateRoute(to);
 
@@ -149,4 +147,3 @@ this.pushOption.value = option ?? null;
         }
-        const pathname = typeof to === "string" ? to : to.pathname;
-        invariant(this.matchedRoute(to), `StackRouter.replace(): None of the route match current pathname:${pathname}. Please make sure you have defined fallback route using "**"`);
+        this.validateRoute(to);
         this.stackHistory.replace(to, {$key: (this.stackHistory.location.state as any)?.$key ?? createKey(), ...(option?.state ?? {})});
@@ -186,5 +183,7 @@ }
 
-    private matchedRoute(to: To): Match<StackRoutePayload> | null {
+    private validateRoute(to: To): Match<StackRoutePayload> {
         const pathname = typeof to === "string" ? to : to.pathname;
         const matched = this.route.lookup(pathname ?? window.location.pathname);
+
+        invariant(matched, `None of the route match current pathname: ${pathname}. Please make sure you have defined fallback route using "**"`);
         return matched;
@@ -194,8 +193,7 @@ }
     private createScreen(location: Location, transitionOption: Required<TransitionOption>): Screen {
-        const matched = this.matchedRoute(location.pathname);
-        invariant(matched, `StackRouter.createScreen(): None of the route match current pathname:${location.pathname}. Please make sure you have defined fallback route using "**"`);
+        const matchedRoute = this.validateRoute(location.pathname);
         return new Screen({
-            content: matched.payload.component,
+            content: matchedRoute.payload.component,
             location,
-            params: matched.params,
+            params: matchedRoute.params,
             searchParams: Object.fromEntries(new URLSearchParams(location.search)),
@@ -202,0 +200,0 @@ transition: {

No alert changes

Worsened metrics

Total package byte prevSize

165453

-0.9%

Lines of code

2557

-0.23%

No dependency changes