one 1.2.19 → 1.2.20
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/cjs/router/router.cjs +35 -5
- package/dist/cjs/router/router.js +26 -5
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +32 -5
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/server/oneServe.js +6 -1
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/setup.native.js.map +1 -6
- package/dist/esm/router/router.js +26 -5
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +35 -5
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +32 -5
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +6 -1
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/package.json +10 -10
- package/src/router/router.ts +45 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
package/src/router/router.ts
CHANGED
|
@@ -65,6 +65,30 @@ export function initialize(
|
|
|
65
65
|
throw new Error('No routes found')
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER && routeNode) {
|
|
69
|
+
const formatRouteTree = (node: RouteNode, indent = '', isLast = true): string => {
|
|
70
|
+
const prefix = indent + (isLast ? '└─ ' : '├─ ')
|
|
71
|
+
const childIndent = indent + (isLast ? ' ' : '│ ')
|
|
72
|
+
|
|
73
|
+
const dynamicBadge = node.dynamic ? ` [${node.dynamic.map((d) => d.name).join(', ')}]` : ''
|
|
74
|
+
const typeBadge = node.type !== 'layout' ? ` (${node.type})` : ''
|
|
75
|
+
const routeName = node.route || '/'
|
|
76
|
+
|
|
77
|
+
let line = `${prefix}${routeName}${dynamicBadge}${typeBadge}`
|
|
78
|
+
|
|
79
|
+
const visibleChildren = node.children.filter((child) => !child.internal)
|
|
80
|
+
for (let i = 0; i < visibleChildren.length; i++) {
|
|
81
|
+
const child = visibleChildren[i]
|
|
82
|
+
const childIsLast = i === visibleChildren.length - 1
|
|
83
|
+
line += '\n' + formatRouteTree(child, childIndent, childIsLast)
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
return line
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
console.info(`[one] 📍 Route structure:\n${formatRouteTree(routeNode)}`)
|
|
90
|
+
}
|
|
91
|
+
|
|
68
92
|
navigationRef = ref
|
|
69
93
|
setupLinkingAndRouteInfo(initialLocation)
|
|
70
94
|
subscribeToNavigationChanges()
|
|
@@ -156,6 +180,9 @@ export function push(url: OneRouter.Href, options?: OneRouter.LinkToOptions) {
|
|
|
156
180
|
}
|
|
157
181
|
|
|
158
182
|
export function dismiss(count?: number) {
|
|
183
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
|
|
184
|
+
console.info(`[one] 🔙 dismiss${count ? ` (${count})` : ''}`)
|
|
185
|
+
}
|
|
159
186
|
navigationRef?.dispatch(StackActions.pop(count))
|
|
160
187
|
}
|
|
161
188
|
|
|
@@ -172,10 +199,16 @@ export function setParams(params: OneRouter.InpurRouteParamsGeneric = {}) {
|
|
|
172
199
|
}
|
|
173
200
|
|
|
174
201
|
export function dismissAll() {
|
|
202
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
|
|
203
|
+
console.info(`[one] 🔙 dismissAll`)
|
|
204
|
+
}
|
|
175
205
|
navigationRef?.dispatch(StackActions.popToTop())
|
|
176
206
|
}
|
|
177
207
|
|
|
178
208
|
export function goBack() {
|
|
209
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
|
|
210
|
+
console.info(`[one] 🔙 goBack`)
|
|
211
|
+
}
|
|
179
212
|
assertIsReady(navigationRef)
|
|
180
213
|
navigationRef?.current?.goBack()
|
|
181
214
|
}
|
|
@@ -217,6 +250,14 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
|
|
|
217
250
|
const nextRouteInfo = getRouteInfo(state)
|
|
218
251
|
|
|
219
252
|
if (!deepEqual(routeInfo, nextRouteInfo)) {
|
|
253
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
|
|
254
|
+
const from = routeInfo?.pathname || '(initial)'
|
|
255
|
+
const to = nextRouteInfo.pathname
|
|
256
|
+
const params = Object.keys(nextRouteInfo.params || {}).length
|
|
257
|
+
? nextRouteInfo.params
|
|
258
|
+
: undefined
|
|
259
|
+
console.info(`[one] 🧭 ${from} → ${to}`, params ? { params } : '')
|
|
260
|
+
}
|
|
220
261
|
routeInfo = nextRouteInfo
|
|
221
262
|
}
|
|
222
263
|
}
|
|
@@ -361,6 +402,10 @@ export function preloadRoute(href: string) {
|
|
|
361
402
|
}
|
|
362
403
|
|
|
363
404
|
export async function linkTo(href: string, event?: string, options?: OneRouter.LinkToOptions) {
|
|
405
|
+
if (process.env.NODE_ENV === 'development' && process.env.ONE_DEBUG_ROUTER) {
|
|
406
|
+
console.info(`[one] 🔗 ${event || 'NAVIGATE'} ${href}`)
|
|
407
|
+
}
|
|
408
|
+
|
|
364
409
|
if (href[0] === '#') {
|
|
365
410
|
// this is just linking to a section of the current page on web
|
|
366
411
|
return
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,iCAAiC,EAAgB,MAAM,0BAA0B,CAAA;AAE/F,OAAO,EAAE,KAAK,aAAa,EAAmD,MAAM,OAAO,CAAA;AAE3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAOrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAKzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAMxC,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,IAAW,CAAA;AAC7C,eAAO,IAAI,aAAa,EAAE,aAAa,CAAA;AAEvC,eAAO,IAAI,wBAAwB,SAAQ,CAAA;AAC3C,eAAO,IAAI,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAC1D,eAAO,IAAI,SAAS,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAGvD,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;AAI3C,eAAO,IAAI,aAAa,EAAE,SAAS,CAAC,aAA2B,CAAA;AAQ/D,wBAAgB,UAAU,CACxB,OAAO,EAAE,GAAG,CAAC,YAAY,EACzB,GAAG,EAAE,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,EACrE,eAAe,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,iCAAiC,EAAgB,MAAM,0BAA0B,CAAA;AAE/F,OAAO,EAAE,KAAK,aAAa,EAAmD,MAAM,OAAO,CAAA;AAE3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAOrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAKzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAMxC,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,IAAW,CAAA;AAC7C,eAAO,IAAI,aAAa,EAAE,aAAa,CAAA;AAEvC,eAAO,IAAI,wBAAwB,SAAQ,CAAA;AAC3C,eAAO,IAAI,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAC1D,eAAO,IAAI,SAAS,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAGvD,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;AAI3C,eAAO,IAAI,aAAa,EAAE,SAAS,CAAC,aAA2B,CAAA;AAQ/D,wBAAgB,UAAU,CACxB,OAAO,EAAE,GAAG,CAAC,YAAY,EACzB,GAAG,EAAE,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,EACrE,eAAe,CAAC,EAAE,GAAG,QA0CtB;AA+ED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,iBAE9E;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,iBAE1E;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,QAKrC;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,iBAE7E;AAED,wBAAgB,SAAS,CAAC,MAAM,GAAE,SAAS,CAAC,uBAA4B,oBAMvE;AAED,wBAAgB,UAAU,SAKzB;AAED,wBAAgB,MAAM,SAMrB;AAED,wBAAgB,SAAS,IAAI,OAAO,CAKnC;AAED,wBAAgB,UAAU,IAAI,OAAO,CAcpC;AAED,wBAAgB,eAAe,gBAK9B;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,EAAE,cAAc,wBAAQ,QAiB/E;AAGD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,CAAC,iBAAiB,cAK3E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,IAAI,cAKtD;AAGD,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,SAAS,CAAC,oBAAoB,cAKjF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,QAM5D;AAUD,wBAAgB,QAAQ;;;;;;;;;;;;qCArQa,IAAI;;gCAIF,IAAI;EAmQ1C;AAqBD,wBAAgB,iBAAiB,0BAEhC;AAED,wBAAgB,iBAAiB,cAEhC;AAGD,wBAAgB,YAAY;;;;;;;;;;;;qCArSS,IAAI;;gCAIF,IAAI;EAmS1C;AAcD,wBAAgB,iBAAiB,0BAGhC;AAED,wBAAgB,iBAAiB,cAGhC;AAGD,wBAAgB,OAAO,SAItB;AAGD,eAAO,MAAM,gBAAgB,IAAK,CAAA;AAmBlC,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,QAaxC;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,iBAiH3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AAgBnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AAgBnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBA0ShG"}
|