@e7w/easy-routes 0.0.6 → 0.0.8

package/dist/components/DefaultOutlet.js

@@ -1,3 +1,3 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { Outlet } from "react-router";
-export const DefaultOutlet = () => (_jsx(_Fragment, { children: _jsx(Outlet, {}) }));
+export var DefaultOutlet = function () { return (_jsx(_Fragment, { children: _jsx(Outlet, {}) })); };

package/dist/components/ErrorBoundary.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { isRouteErrorResponse, useRouteError } from "react-router";
-export const ErrorBoundary = () => {
-    const error = useRouteError();
+export var ErrorBoundary = function () {
+    var error = useRouteError();
     return (_jsx("div", { className: "flex h-screen w-full items-center justify-center", children: _jsxs("div", { className: "flex flex-col items-center justify-center", children: [_jsx("h1", { className: "text-2xl font-bold mb-4", children: "Error" }), _jsx("p", { children: "Something went wrong." }), isRouteErrorResponse(error) && (_jsxs(_Fragment, { children: [_jsxs("p", { className: "text-red-300", children: [error.status, " ", error.statusText] }), _jsx("p", { className: "text-red-300", children: JSON.stringify(error.data) })] })), error instanceof Error && (_jsx("p", { className: "text-red-300", children: error.message }))] }) }));
 };

package/dist/components/Loading.js

@@ -3,9 +3,9 @@ import {} from "react";
 import { useDebouncedValue } from "../utils/hooks";
 import { useLoader } from "@e7w/easy-model";
 import "../assets/index.css";
-export const Loading = () => {
-    const { isGlobalLoading } = useLoader();
-    const visible = useDebouncedValue(isGlobalLoading);
+export var Loading = function () {
+    var isGlobalLoading = useLoader().isGlobalLoading;
+    var visible = useDebouncedValue(isGlobalLoading);
     if (!visible)
         return;
     return (_jsxs("div", { className: "spinner-box", children: [_jsx("div", { className: "blue-orbit leo" }), _jsx("div", { className: "green-orbit leo" }), _jsx("div", { className: "red-orbit leo" }), _jsx("div", { className: "white-orbit w1 leo" }), _jsx("div", { className: "white-orbit w2 leo" }), _jsx("div", { className: "white-orbit w3 leo" })] }));

package/dist/components/ProgressLayout.js

@@ -11,9 +11,9 @@ nProgress.configure({
     easing: "ease", // 动画缓动函数
     trickleSpeed: 200, // 进度条自动递增的频率（毫秒）
 });
-export const ProgressLayout = () => {
-    const { state } = useNavigation();
-    useEffect(() => {
+export var ProgressLayout = function () {
+    var state = useNavigation().state;
+    useEffect(function () {
         if (state === "loading") {
             nProgress.start();
         }

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export type { Loader } from "./types";
-export { routerSchema } from "./models/system";
+export type { Ctx } from "./types";
+export { RouterSchema } from "./models/system";
 export { routes } from "./router";

package/dist/index.js

@@ -1,2 +1,2 @@
-export { routerSchema } from "./models/system";
+export { RouterSchema } from "./models/system";
 export { routes } from "./router";

package/dist/models/system.d.ts

@@ -1,15 +1,16 @@
 import z from "zod";
-import type { Ctx } from "../types";
-import type { Params } from "react-router";
-export interface RouterSchema {
-    init(): void | Promise<void>;
+import type { Ctx, Meta } from "../types";
+interface RouterSchema {
+    init(req: Ctx["req"], meta: Meta): void | Promise<void>;
     permission: number;
     defaultTitle?: string;
 }
-export declare const routerSchema: z.ZodType<RouterSchema, RouterSchema>;
+export declare const RouterSchema: z.ZodType<RouterSchema, RouterSchema>;
 export declare const system: {
     router: RouterSchema;
-    init(): Promise<void>;
+    ready: boolean;
+    init(req: Ctx["req"], meta: Meta): Promise<void>;
     hasPermission(permission?: number): boolean;
-    getCtx(params: Params, request: Request, permission?: number): Ctx;
+    getCtx(req: Ctx["req"], permission?: number): Ctx;
 };
+export {};

package/dist/models/system.js

@@ -32,53 +32,127 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { inject, loader, provide } from "@e7w/easy-model";
 import z from "zod";
-export const routerSchema = z.object({
+export var RouterSchema = z.object({
     init: z.function({
         output: z.union([z.promise(z.void()), z.void()]),
     }),
     permission: z.number(),
     defaultTitle: z.string().optional(),
 });
-export const system = provide((() => {
+export var system = provide((function () {
     var _a;
-    let _instanceExtraInitializers = [];
-    let _router_decorators;
-    let _router_initializers = [];
-    let _router_extraInitializers = [];
-    let _init_decorators;
-    return class System {
-        static {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _router_decorators = [inject(routerSchema)];
-            _init_decorators = [(_a = loader).once.bind(_a), loader.load(true)];
-            __esDecorate(this, null, _init_decorators, { kind: "method", name: "init", static: false, private: false, access: { has: obj => "init" in obj, get: obj => obj.init }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(null, null, _router_decorators, { kind: "field", name: "router", static: false, private: false, access: { has: obj => "router" in obj, get: obj => obj.router, set: (obj, value) => { obj.router = value; } }, metadata: _metadata }, _router_initializers, _router_extraInitializers);
-            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        }
-        router = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _router_initializers, {
-            init() { },
-            permission: 0,
-            defaultTitle: document.title,
-        }));
-        async init() {
-            await this.router.init();
-        }
-        hasPermission(permission = 0) {
-            return (this.router.permission & permission) === permission;
-        }
-        getCtx(params, request, permission = 1) {
-            return {
-                title: this.router.defaultTitle || document.title,
-                signed: (permission & 1) === 0 || this.hasPermission(1),
-                noPermission: !this.hasPermission(permission),
-                params,
-                query: Object.fromEntries(new URL(request.url).searchParams),
-            };
-        }
-        constructor() {
-            __runInitializers(this, _router_extraInitializers);
-        }
-    };
+    var _instanceExtraInitializers = [];
+    var _router_decorators;
+    var _router_initializers = [];
+    var _router_extraInitializers = [];
+    var _init_decorators;
+    return _a = /** @class */ (function () {
+            function System() {
+                Object.defineProperty(this, "router", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _router_initializers, {
+                        init: function () { },
+                        permission: 0,
+                        defaultTitle: document.title,
+                    }))
+                });
+                Object.defineProperty(this, "ready", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: (__runInitializers(this, _router_extraInitializers), false)
+                });
+            }
+            Object.defineProperty(System.prototype, "init", {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: function (req, meta) {
+                    return __awaiter(this, void 0, void 0, function () {
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0: return [4 /*yield*/, this.router.init(req, meta)];
+                                case 1:
+                                    _b.sent();
+                                    this.ready = true;
+                                    return [2 /*return*/];
+                            }
+                        });
+                    });
+                }
+            });
+            Object.defineProperty(System.prototype, "hasPermission", {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: function (permission) {
+                    if (permission === void 0) { permission = 0; }
+                    return (this.router.permission & permission) === permission;
+                }
+            });
+            Object.defineProperty(System.prototype, "getCtx", {
+                enumerable: false,
+                configurable: true,
+                writable: true,
+                value: function (req, permission) {
+                    if (permission === void 0) { permission = 1; }
+                    return {
+                        title: this.router.defaultTitle || document.title,
+                        signed: (permission & 1) === 0 || this.hasPermission(1),
+                        noPermission: !this.hasPermission(permission),
+                        req: req,
+                    };
+                }
+            });
+            return System;
+        }()),
+        (function () {
+            var _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _router_decorators = [inject(RouterSchema)];
+            _init_decorators = [loader.load(true)];
+            __esDecorate(_a, null, _init_decorators, { kind: "method", name: "init", static: false, private: false, access: { has: function (obj) { return "init" in obj; }, get: function (obj) { return obj.init; } }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, null, _router_decorators, { kind: "field", name: "router", static: false, private: false, access: { has: function (obj) { return "router" in obj; }, get: function (obj) { return obj.router; }, set: function (obj, value) { obj.router = value; } }, metadata: _metadata }, _router_initializers, _router_extraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
 })())();

package/dist/router.js

@@ -1,71 +1,143 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Navigate, redirect } from "react-router";
 import { DefaultOutlet } from "./components/DefaultOutlet";
 import { ErrorBoundary } from "./components/ErrorBoundary";
 import { ProgressLayout } from "./components/ProgressLayout";
 import { system } from "./models/system";
-const pages = import.meta.glob("/src/pages/**/index.tsx", {
+var pages = import.meta.glob("/src/pages/**/index.tsx", {
     eager: true,
     import: "Page",
 });
-const layouts = import.meta.glob("/src/pages/**/layout.tsx", {
+var layouts = import.meta.glob("/src/pages/**/layout.tsx", {
     eager: true,
     import: "Layout",
 });
-const metas = import.meta.glob("/src/pages/**/meta.ts", {
+var metas = import.meta.glob("/src/pages/**/meta.ts", {
     eager: true,
 });
-const routes = [];
-const obj = {};
-const filePaths = new Set(Object.keys({ ...pages, ...layouts }).map((p) => p.replace(/\/(index|layout)\.tsx$/, "")));
-filePaths.forEach((filePath) => {
-    const pagePath = filePath + "/index.tsx";
-    const Page = pages[pagePath];
-    const layoutPath = filePath + "/layout.tsx";
-    const Layout = layouts[layoutPath] || DefaultOutlet;
-    const metaPath = filePath + "/meta.ts";
-    const meta = metas[metaPath] || {};
-    const path = filePath.replace(/.*\/pages/, "").replace(/\[([^\]]+)\]/, ":$1") || "/";
-    const hasPage = Boolean(Page);
+var routes = [];
+var obj = {};
+var filePaths = new Set(Object.keys(__assign(__assign({}, pages), layouts)).map(function (p) {
+    return p.replace(/\/(index|layout)\.tsx$/, "");
+}));
+filePaths.forEach(function (filePath) {
+    var pagePath = filePath + "/index.tsx";
+    var Page = pages[pagePath];
+    var layoutPath = filePath + "/layout.tsx";
+    var Layout = layouts[layoutPath] || DefaultOutlet;
+    var metaPath = filePath + "/meta.ts";
+    var meta = metas[metaPath] || {};
+    var path = filePath.replace(/.*\/pages/, "").replace(/\[([^\]]+)\]/, ":$1") || "/";
+    var hasPage = Boolean(Page);
     obj[path] = {
-        path,
+        path: path,
         element: _jsx(Layout, {}),
         children: [
             {
                 element: hasPage ? _jsx(Page, {}) : _jsx(Navigate, { to: "/", replace: true }),
                 index: true,
                 loader: hasPage
-                    ? async ({ params, request }) => {
-                        await system.init()?.catch(() => { });
-                        const ctx = system.getCtx(params, request, meta.permission);
-                        await meta.loader?.(ctx, meta)?.catch?.(() => { });
-                        if (!ctx.signed)
-                            return redirect("/login");
-                        if (ctx.noPermission)
-                            return redirect("/403");
-                        document.title = ctx.title;
-                        return ctx.data;
-                    }
+                    ? function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+                        var url, req, ctx;
+                        var _c, _d, _e, _f, _g;
+                        var params = _b.params, request = _b.request;
+                        return __generator(this, function (_h) {
+                            switch (_h.label) {
+                                case 0:
+                                    url = new URL(request.url);
+                                    req = {
+                                        params: params,
+                                        query: Object.fromEntries(url.searchParams),
+                                        pathname: url.pathname.replace(/\/$/, ""),
+                                    };
+                                    if (!!system.ready) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, ((_d = (_c = system.init(req, meta)) === null || _c === void 0 ? void 0 : _c.catch) === null || _d === void 0 ? void 0 : _d.call(_c, function () { }))];
+                                case 1:
+                                    _h.sent();
+                                    _h.label = 2;
+                                case 2:
+                                    ctx = system.getCtx(req, meta.permission);
+                                    return [4 /*yield*/, ((_g = (_f = (_e = meta.loader) === null || _e === void 0 ? void 0 : _e.call(meta, ctx)) === null || _f === void 0 ? void 0 : _f.catch) === null || _g === void 0 ? void 0 : _g.call(_f, function () { }))];
+                                case 3:
+                                    _h.sent();
+                                    if (!ctx.signed) {
+                                        system.ready = false;
+                                        return [2 /*return*/, redirect("/login?from=".concat(encodeURIComponent(request.url)))];
+                                    }
+                                    if (ctx.noPermission)
+                                        return [2 /*return*/, redirect("/403")];
+                                    document.title = ctx.title;
+                                    return [2 /*return*/, ctx.data];
+                            }
+                        });
+                    }); }
                     : undefined,
             },
         ],
     };
 });
-filePaths.forEach((filePath) => {
-    const path = filePath.replace(/.*\/pages/, "").replace(/\[([^\]]+)\]/, ":$1") || "/";
+filePaths.forEach(function (filePath) {
+    var path = filePath.replace(/.*\/pages/, "").replace(/\[([^\]]+)\]/, ":$1") || "/";
     if (path === "/")
         return;
-    const currentObj = obj[path];
-    const segments = path.split("/").filter(Boolean);
-    const paths = ["/"];
-    segments.reduce((acc, curr) => {
-        const newPath = acc + "/" + curr;
+    var currentObj = obj[path];
+    var segments = path.split("/").filter(Boolean);
+    var paths = ["/"];
+    segments.reduce(function (acc, curr) {
+        var newPath = acc + "/" + curr;
         if (newPath !== path)
             paths.unshift(newPath);
         return newPath;
     }, "");
-    for (let index = 0; index < paths.length; index++) {
-        const p = paths[index];
+    for (var index = 0; index < paths.length; index++) {
+        var p = paths[index];
         if (obj[p]) {
             obj[p].children.push(currentObj);
             break;

package/dist/types/index.d.ts

@@ -3,12 +3,14 @@ export interface Ctx {
     title: string;
     signed: boolean;
     noPermission: boolean;
-    params: Params;
-    query: Params;
+    req: {
+        params: Params;
+        query: Params;
+        pathname: string;
+    };
     data?: any;
 }
 export type Meta = {
     permission?: number;
-    loader?: Loader;
+    loader?(ctx: Ctx): void | Promise<void>;
 } & Record<string, unknown>;
-export type Loader = (ctx: Ctx, meta: Meta) => void | Promise<void>;

package/dist/utils/hooks.js

@@ -1,13 +1,13 @@
 import { useEffect, useRef, useState } from "react";
 export function useDebouncedValue(value) {
-    const [result, setResult] = useState(value);
-    const timer = useRef(undefined);
-    useEffect(() => {
+    var _a = useState(value), result = _a[0], setResult = _a[1];
+    var timer = useRef(undefined);
+    useEffect(function () {
         clearTimeout(timer.current);
-        timer.current = window.setTimeout(() => {
+        timer.current = window.setTimeout(function () {
             setResult(value);
         }, 700);
-        return () => {
+        return function () {
             window.clearTimeout(timer.current);
         };
     }, [result, value]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e7w/easy-routes",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"