version 1.2.3. Add TypeScript Var Export

iuroc · Jan 10, 2024 · 7289d70 · 7289d70
1 parent 9616932
commit 7289d70
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/js/index.js b/js/index.js
@@ -1,16 +1,16 @@
 import van from 'vanjs-core';
 const { div } = van.tags;
 /** 从 `location.hash` 获取当前路由 */
-const nowRoute = () => {
+export const nowRoute = () => {
     const li = location.hash.split('/');
     const route = { name: li[1] ?? 'home', args: li.slice(2) };
     return route;
 };
-const activeRoute = van.state(nowRoute());
+export const activeRoute = van.state(nowRoute());
 window.addEventListener('hashchange', () => {
     activeRoute.val = nowRoute();
 });
-const Route = (first, ...rest) => {
+export const Route = (first, ...rest) => {
     const { name, onFirst, onLoad, ...otherProp } = first;
     let firstLoad = true;
     van.derive(() => {
@@ -25,7 +25,7 @@ const Route = (first, ...rest) => {
     });
     return div({ hidden: () => first.name != activeRoute.val.name, ...otherProp }, rest);
 };
-const routeTo = (name = 'home', args = []) => {
+export const routeTo = (name = 'home', args = []) => {
     if (args.length == 0) {
         if (name == 'home') {
             location.hash = '';
@@ -37,4 +37,3 @@ const routeTo = (name = 'home', args = []) => {
     else
         location.hash = `/${name}/${args.join('/')}`;
 };
-export { Route, routeTo };
diff --git a/js/vanjs-router-1.2.2.js → js/vanjs-router-1.2.3.js b/js/vanjs-router-1.2.2.js → js/vanjs-router-1.2.3.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
         "vanjs-core": "^1.2.7"
     },
     "name": "vanjs-router",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "基于 Van.js 的前端路由控制系统",
     "main": "js/index.js",
     "types": "src/index.ts",

diff --git a/src/index.ts b/src/index.ts
@@ -3,14 +3,14 @@ import van, { ChildDom, PropValueOrDerived, Props, PropsWithKnownKeys } from 'va
 const { div } = van.tags
 
 /** 来自 `location.hash` 的路由信息 */
-interface Route {
+export interface Route {
     /** 路由名称 */
     readonly name: string
     /** 路由参数 */
     readonly args: readonly string[]
 }
 
-interface RouteSetting {
+export interface RouteSetting {
     /** 路由名称 */
     readonly name: string
     /** 初次路由载入 */
@@ -21,19 +21,19 @@ interface RouteSetting {
 }
 
 /** 从 `location.hash` 获取当前路由 */
-const nowRoute = () => {
+export const nowRoute = () => {
     const li = location.hash.split('/')
     const route: Route = { name: li[1] ?? 'home', args: li.slice(2) }
     return route
 }
 
-const activeRoute = van.state(nowRoute())
+export const activeRoute = van.state(nowRoute())
 
 window.addEventListener('hashchange', () => {
     activeRoute.val = nowRoute()
 })
 
-const Route = (first: RouteSetting & Props & PropsWithKnownKeys<HTMLDivElement>, ...rest: readonly ChildDom[]) => {
+export const Route = (first: RouteSetting & Props & PropsWithKnownKeys<HTMLDivElement>, ...rest: readonly ChildDom[]) => {
     const { name, onFirst, onLoad, ...otherProp } = first
     let firstLoad = true
     van.derive(() => {
@@ -48,13 +48,11 @@ const Route = (first: RouteSetting & Props & PropsWithKnownKeys<HTMLDivElement>,
     return div({ hidden: () => first.name != activeRoute.val.name, ...otherProp }, rest)
 }
 
-const routeTo = (name: Route['name'] = 'home', args: any[] = []) => {
+export const routeTo = (name: Route['name'] = 'home', args: any[] = []) => {
     if (args.length == 0) {
         if (name == 'home') {
             location.hash = ''
             history.replaceState(null, '', './')
         } else location.hash = `/${name}`
     } else location.hash = `/${name}/${args.join('/')}`
-}
-
-export { Route, routeTo }
+}