@tooee/router 0.1.14 → 0.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +8 -3
- package/dist/context.js.map +1 -1
- package/dist/outlet.js +1 -1
- package/dist/outlet.js.map +1 -1
- package/package.json +7 -7
- package/src/context.tsx +9 -3
- package/src/outlet.tsx +1 -1
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAM5D,eAAO,MAAM,sBAAsB,iCAA2B,CAAA;AAI9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,YAAY,EACZ,aAAa,EACb,QAAQ,GACT,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAM5D,eAAO,MAAM,sBAAsB,iCAA2B,CAAA;AAI9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,cAAc,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,YAAY,EACZ,aAAa,EACb,QAAQ,GACT,EAAE,mBAAmB,aAoBrB;AAID,wBAAgB,iBAAiB,IAAI,cAAc,CAIlD;AAED,wBAAgB,cAAc,IAAI,SAAS,UAAU,EAAE,CAEtD;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C"}
|
package/dist/context.js
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@opentui/react/jsx-runtime";
|
|
2
|
-
import { createContext, useContext, useEffect, useSyncExternalStore } from "react";
|
|
2
|
+
import { createContext, useContext, useEffect, useRef, useSyncExternalStore } from "react";
|
|
3
3
|
// Contexts
|
|
4
4
|
const RouterInstanceContext = createContext(null);
|
|
5
5
|
const RouterStackContext = createContext([]);
|
|
6
6
|
export const StackEntryIndexContext = createContext(0);
|
|
7
7
|
export function RouterProvider({ router, initialRoute, initialParams, children, }) {
|
|
8
|
+
const initialRouteRef = useRef(initialRoute);
|
|
9
|
+
const initialParamsRef = useRef(initialParams);
|
|
10
|
+
const routerRef = useRef(router);
|
|
8
11
|
useEffect(() => {
|
|
9
|
-
|
|
10
|
-
|
|
12
|
+
const mountInitialRoute = initialRouteRef.current;
|
|
13
|
+
const mountRouter = routerRef.current;
|
|
14
|
+
if (mountInitialRoute && mountRouter.currentRoute.routeId !== mountInitialRoute) {
|
|
15
|
+
mountRouter.reset(mountInitialRoute, initialParamsRef.current);
|
|
11
16
|
}
|
|
12
17
|
}, []); // only on mount
|
|
13
18
|
const stack = useSyncExternalStore(router.subscribe, () => router.stack);
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAI1F,WAAW;AAEX,MAAM,qBAAqB,GAAG,aAAa,CAAwB,IAAI,CAAC,CAAA;AACxE,MAAM,kBAAkB,GAAG,aAAa,CAAwB,EAAE,CAAC,CAAA;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAS,CAAC,CAAC,CAAA;AAW9D,MAAM,UAAU,cAAc,CAAC,EAC7B,MAAM,EACN,YAAY,EACZ,aAAa,EACb,QAAQ,GACY;IACpB,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;IAC5C,MAAM,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAA;IAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAA;QACjD,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAA;QACrC,IAAI,iBAAiB,IAAI,WAAW,CAAC,YAAY,CAAC,OAAO,KAAK,iBAAiB,EAAE,CAAC;YAChF,WAAW,CAAC,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;QAChE,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,gBAAgB;IAEvB,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAExE,OAAO,CACL,KAAC,qBAAqB,IAAC,KAAK,EAAE,MAAM,YAClC,KAAC,kBAAkB,IAAC,KAAK,EAAE,KAAK,YAAG,QAAQ,GAAsB,GAC3C,CACzB,CAAA;AACH,CAAC;AAED,iBAAiB;AAEjB,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;IAC7C,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;IACjF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,UAAU,CAAC,kBAAkB,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,UAAU,CAAC,sBAAsB,CAAC,CAAA;AAC3C,CAAC"}
|
package/dist/outlet.js
CHANGED
|
@@ -43,7 +43,7 @@ function RouteRenderer({ entry, routeDef, children, }) {
|
|
|
43
43
|
return () => {
|
|
44
44
|
cancelled = true;
|
|
45
45
|
};
|
|
46
|
-
}, [entry, routeDef
|
|
46
|
+
}, [entry, routeDef]);
|
|
47
47
|
if (error && routeDef.errorComponent) {
|
|
48
48
|
return createElement(routeDef.errorComponent, { error });
|
|
49
49
|
}
|
package/dist/outlet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet.js","sourceRoot":"","sources":["../src/outlet.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGrF,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAE/C,yBAAyB;AAEzB,MAAM,kBAAkB,GAAG,aAAa,CAAS,CAAC,CAAC,CAAA;AAEnD,yDAAyD;AAEzD,MAAM,UAAU,aAAa,CAC3B,QAA0D,EAC1D,OAAe;IAEf,MAAM,KAAK,GAAsB,EAAE,CAAA;IACnC,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnC,OAAO,OAAO,EAAE,CAAC;QACf,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;IAC1B,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,sDAAsD;AAEtD,SAAS,aAAa,CAAC,EACrB,KAAK,EACL,QAAQ,EACR,QAAQ,GAKT;IACC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAU,SAAS,CAAC,CAAA;IACpD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACzD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,IAAI,CAAC,CAAA;IAEtD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAM;QAC5B,IAAI,SAAS,GAAG,KAAK,CAAA;QACrB,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,QAAQ,CAAC,IAAI,CAAC,CAAA;QACd,QAAQ;aACL,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;aAChC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,CAAC,MAAM,CAAC,CAAA;gBACf,UAAU,CAAC,KAAK,CAAC,CAAA;YACnB,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,QAAQ,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBAC7D,UAAU,CAAC,KAAK,CAAC,CAAA;YACnB,CAAC;QACH,CAAC,CAAC,CAAA;QACJ,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,IAAI,CAAA;QAClB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"outlet.js","sourceRoot":"","sources":["../src/outlet.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tooee/router",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.16",
|
|
4
4
|
"description": "Stack-based router for Tooee terminal apps",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cli",
|
|
@@ -36,17 +36,17 @@
|
|
|
36
36
|
"typecheck": "tsc --noEmit"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@opentui/core": "^0.
|
|
40
|
-
"@opentui/react": "^0.
|
|
41
|
-
"@tooee/commands": "0.1.
|
|
39
|
+
"@opentui/core": "^0.2.15",
|
|
40
|
+
"@opentui/react": "^0.2.15",
|
|
41
|
+
"@tooee/commands": "0.1.16",
|
|
42
42
|
"@types/bun": "^1.3.10",
|
|
43
43
|
"@types/react": "^19.2.14",
|
|
44
44
|
"typescript": "^5.9.3"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
|
-
"@opentui/core": "^0.
|
|
48
|
-
"@opentui/react": "^0.
|
|
49
|
-
"@tooee/commands": "0.1.
|
|
47
|
+
"@opentui/core": "^0.2.15",
|
|
48
|
+
"@opentui/react": "^0.2.15",
|
|
49
|
+
"@tooee/commands": "0.1.16",
|
|
50
50
|
"react": "^18.0.0 || ^19.0.0"
|
|
51
51
|
}
|
|
52
52
|
}
|
package/src/context.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createContext, useContext, useEffect, useSyncExternalStore } from "react"
|
|
1
|
+
import { createContext, useContext, useEffect, useRef, useSyncExternalStore } from "react"
|
|
2
2
|
import type { ReactNode } from "react"
|
|
3
3
|
import type { RouterInstance, StackEntry } from "./types.js"
|
|
4
4
|
|
|
@@ -23,9 +23,15 @@ export function RouterProvider({
|
|
|
23
23
|
initialParams,
|
|
24
24
|
children,
|
|
25
25
|
}: RouterProviderProps) {
|
|
26
|
+
const initialRouteRef = useRef(initialRoute)
|
|
27
|
+
const initialParamsRef = useRef(initialParams)
|
|
28
|
+
const routerRef = useRef(router)
|
|
29
|
+
|
|
26
30
|
useEffect(() => {
|
|
27
|
-
|
|
28
|
-
|
|
31
|
+
const mountInitialRoute = initialRouteRef.current
|
|
32
|
+
const mountRouter = routerRef.current
|
|
33
|
+
if (mountInitialRoute && mountRouter.currentRoute.routeId !== mountInitialRoute) {
|
|
34
|
+
mountRouter.reset(mountInitialRoute, initialParamsRef.current)
|
|
29
35
|
}
|
|
30
36
|
}, []) // only on mount
|
|
31
37
|
|
package/src/outlet.tsx
CHANGED