@spacego/fe-components 0.0.1-alpha.7 → 0.0.2

package/lib/router/permission.js

@@ -1,41 +1,41 @@
 import { message as o } from "antd";
 import { redirect as e } from "react-router-dom";
 function h(i) {
-  const { getToken: r, setToken: a, removeToken: s } = i;
-  function u() {
+  const { getToken: r, setToken: a, removeToken: u } = i;
+  function s() {
     return { token: r() };
   }
-  function m({ request: t }) {
+  function l({ request: n }) {
     if (!r()) {
-      const n = new URLSearchParams();
-      return n.set("from", new URL(t.url).pathname), e("/auth/login?" + n.toString());
+      const t = new URLSearchParams();
+      return t.set("from", new URL(n.url).pathname), e("/auth/login?" + t.toString());
     }
     return null;
   }
-  async function f() {
+  async function m() {
     return r() ? e("/") : null;
   }
-  async function g({ request: t }) {
-    const c = await t.formData(), n = c.get("token");
-    if (!n)
-      return o.warning("You must provide a token to log in");
+  async function f({ request: n }) {
+    const c = await n.formData(), t = c.get("token");
+    if (!t)
+      return o.warning("You must provide a token to log in"), null;
     try {
-      a(n), o.success("登录成功");
+      a(t), o.success("登录成功");
     } catch {
-      return o.warning("Invalid login attempt");
+      return o.warning("Invalid login attempt"), null;
     }
-    const l = c.get("redirectTo");
-    return e(l || "/");
+    const k = c.get("redirectTo");
+    return e(k || "/");
   }
-  function k() {
-    return s(), o.success("退出成功"), e("/auth/login");
+  function g() {
+    return u(), o.success("退出成功"), e("/auth/login");
   }
   return {
-    RootLoader: u,
-    ProtectedLoader: m,
-    LoginLoader: f,
-    LoginAction: g,
-    LogoutAction: k
+    RootLoader: s,
+    ProtectedLoader: l,
+    LoginLoader: m,
+    LoginAction: f,
+    LogoutAction: g
   };
 }
 export {

package/lib/router/utils.js

@@ -1,30 +1,26 @@
-import { lazy as g } from "react";
-function C(o) {
+import { lazy as y, createElement as C } from "react";
+function R(o) {
   return `/src/pages/${o.replace(/^\/+/, "")}/index.tsx`;
 }
-function R(o, r) {
-  const d = r[C(o)];
-  if (!d) {
-    console.warn(`Module not found for path: ${o}`);
-    return;
-  }
-  return g(d);
+function v(o, i) {
+  const d = i[R(o)];
+  return d ? y(d) : (console.warn(`Module not found for path: ${o}`), y(() => Promise.resolve({ default: () => C("div", null, `Module not found: ${o}`) })));
 }
 function w(o) {
   if (o)
     return o.startsWith("/") ? o : `/${o}`;
 }
-function y(o, r) {
-  return (o.sort ?? 0) - (r.sort ?? 0);
+function T(o, i) {
+  return (o.sort ?? 0) - (i.sort ?? 0);
 }
-function E(o, r, d) {
-  const p = [...o].sort(y).reduce((e, t) => {
+function N(o, i, d) {
+  const p = [...o].sort(T).reduce((e, t) => {
     const n = t.menuType || 2;
     return e[n] || (e[n] = []), e[n].push(t), e;
-  }, {}), T = (p[3] || []).filter((e) => e.menuCode).map((e) => e.menuCode), l = [
+  }, {}), g = (p[3] || []).filter((e) => e.menuCode).map((e) => e.menuCode), l = [
     ...p[1] || [],
     ...p[2] || []
-  ].sort(y), u = /* @__PURE__ */ new Map(), f = [];
+  ].sort(T), c = /* @__PURE__ */ new Map(), f = [];
   l.forEach((e) => {
     const t = e.parentId || "/", n = w(e.path), s = {
       id: e.menuId,
@@ -40,22 +36,22 @@ function E(o, r, d) {
       }
     };
     if (e.menuType === 2 && e.menuCode) {
-      const i = R(e.menuCode, r);
-      i && (s.Component = i), e.index && (s.index = !0, delete s.path), e.protected !== !1 && d && (s.loader = d);
+      const r = v(e.menuCode, i);
+      r && (s.Component = r), e.index && (s.index = !0, delete s.path), e.protected !== !1 && d && (s.loader = d);
     }
-    u.set(e.menuId, s);
+    c.set(e.menuId, s);
   }), l.forEach((e) => {
-    const t = u.get(e.menuId), n = e.parentId;
+    const t = c.get(e.menuId), n = e.parentId;
     if (n && n !== "/") {
-      const s = u.get(n);
+      const s = c.get(n);
       s ? (s.children || (s.children = []), s.children.push(t)) : f.push(t);
     } else
       f.push(t);
   });
-  const h = /* @__PURE__ */ new Map(), a = [], I = l.filter((e) => e.isShowMenu !== !1);
+  const a = /* @__PURE__ */ new Map(), h = [], I = l.filter((e) => e.isShowMenu !== !1);
   I.forEach((e) => {
-    const t = u.get(e.menuId), n = t ? (() => {
-      const { children: i, ...m } = t;
+    const t = c.get(e.menuId), n = t ? (() => {
+      const { children: r, ...m } = t;
       return m;
     })() : void 0, s = {
       key: e.menuId,
@@ -65,27 +61,27 @@ function E(o, r, d) {
       menuType: e.menuType,
       isIndependentMenu: e.isIndependentMenu
     };
-    h.set(e.menuId, s);
+    a.set(e.menuId, s);
   }), I.forEach((e) => {
-    const t = h.get(e.menuId), n = e.parentId;
+    const t = a.get(e.menuId), n = e.parentId;
     if (n && n !== "/") {
-      const s = h.get(n);
-      s ? (s.children || (s.children = []), s.children.push(t)) : a.push(t);
+      const s = a.get(n);
+      s ? (s.children || (s.children = []), s.children.push(t)) : h.push(t);
     } else
-      a.push(t);
+      h.push(t);
   });
   function M(e) {
     const t = [];
     return e.forEach((n) => {
       if (n.children && n.children.length > 0 && (n.children = M(n.children)), n.menuType === 1 && n.children && n.children.length > 0) {
-        const s = n.children.filter((i) => i.isIndependentMenu === !0 && i.menuType === 2 && !i.customType);
+        const s = n.children.filter((r) => r.isIndependentMenu === !0 && r.menuType === 2 && !r.customType);
         if (s.length > 0) {
-          const i = s.map((c) => ({
-            ...c,
+          const r = s.map((u) => ({
+            ...u,
             customType: "menu-promoted"
             // 内部标识，表示这个菜单是被提升的
-          })), m = n.children.filter((c) => !(c.isIndependentMenu === !0 && c.menuType === 2 && !c.customType));
-          t.push(...i, ...m);
+          })), m = n.children.filter((u) => !(u.isIndependentMenu === !0 && u.menuType === 2 && !u.customType));
+          t.push(...r, ...m);
         } else
           t.push(n);
       } else
@@ -94,12 +90,12 @@ function E(o, r, d) {
   }
   return {
     routes: f,
-    menus: M(a),
-    permissions: T
+    menus: M(h),
+    permissions: g
   };
 }
 export {
-  R as createLazyComponent,
-  C as getPath,
-  E as processRoutes
+  v as createLazyComponent,
+  R as getPath,
+  N as processRoutes
 };

package/lib/types/router/index.d.ts

@@ -25,7 +25,7 @@ export declare function createRouter(options: CreateRouterOptions): {
         RootLoader: () => import('./permission').AuthStatus;
         ProtectedLoader: ({ request }: import('react-router-dom').LoaderFunctionArgs) => Response | null;
         LoginLoader: () => Promise<Response | null>;
-        LoginAction: ({ request }: import('react-router-dom').LoaderFunctionArgs) => Promise<boolean | Response>;
+        LoginAction: ({ request }: import('react-router-dom').LoaderFunctionArgs) => Promise<Response | null>;
         LogoutAction: () => Response;
     };
 };

package/lib/types/router/permission.d.ts

@@ -18,6 +18,6 @@ export declare function createPermissionHelpers(tokenHelpers: TokenHelpers): {
     RootLoader: () => AuthStatus;
     ProtectedLoader: ({ request }: LoaderFunctionArgs) => Response | null;
     LoginLoader: () => Promise<Response | null>;
-    LoginAction: ({ request }: LoaderFunctionArgs) => Promise<boolean | Response>;
+    LoginAction: ({ request }: LoaderFunctionArgs) => Promise<Response | null>;
     LogoutAction: () => Response;
 };

package/lib/types/router/utils.d.ts

@@ -18,7 +18,7 @@ export declare function getPath(name: string): string;
  * @param modules
  * @returns
  */
-export declare function createLazyComponent(name: string, modules: TModule): import('react').LazyExoticComponent<ComponentType<any>> | undefined;
+export declare function createLazyComponent(name: string, modules: TModule): import('react').LazyExoticComponent<ComponentType<any>> | import('react').LazyExoticComponent<() => import('react').DetailedReactHTMLElement<import('react').HTMLAttributes<HTMLElement>, HTMLElement>>;
 /** 路由节点类型 */
 type RouteNode = RouteObject & {
     parentId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spacego/fe-components",
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.2",
   "description": "🚀 A component library for fe to use.",
   "type": "module",
   "main": "lib/index.js",