@e7w/easy-routes 0.0.7 → 0.0.9

package/README.md

@@ -1,6 +1,6 @@
 # 自用React-router配置
 
-/src/pages/\*\*/page.tsx为页面
+src/\*\*/pages/\*\*/page.tsx为页面
 
 ```ts
 export function Page() {}
@@ -8,7 +8,7 @@ export function Page() {}
 
 ---
 
-/src/pages/\*\*/layout.tsx为layout
+src/\*\*/pages/\*\*/layout.tsx为layout
 
 ```ts
 export function Layout() {
@@ -18,7 +18,7 @@ export function Layout() {
 
 ---
 
-/src/pages/\*\*/meta.ts配置如下
+src/\*\*/pages/\*\*/meta.ts配置如下
 
 ```ts
 export const permission: number = 0b0; // 默认是0b0代表需要登录，只有最右边的一位代表登录，其他位可以自己定enum代表权限

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,16 +1,15 @@
 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;
-    ready: boolean;
-    init(): Promise<void>;
+    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

@@ -70,7 +70,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { inject, loader, provide } from "@e7w/easy-model";
 import z from "zod";
-export var routerSchema = z.object({
+export var RouterSchema = z.object({
     init: z.function({
         output: z.union([z.promise(z.void()), z.void()]),
     }),
@@ -79,6 +79,7 @@ export var routerSchema = z.object({
 });
 export var system = provide((function () {
     var _a;
+    var _b;
     var _instanceExtraInitializers = [];
     var _router_decorators;
     var _router_initializers = [];
@@ -96,25 +97,19 @@ export var system = provide((function () {
                         defaultTitle: document.title,
                     }))
                 });
-                Object.defineProperty(this, "ready", {
-                    enumerable: true,
-                    configurable: true,
-                    writable: true,
-                    value: (__runInitializers(this, _router_extraInitializers), false)
-                });
+                __runInitializers(this, _router_extraInitializers);
             }
             Object.defineProperty(System.prototype, "init", {
                 enumerable: false,
                 configurable: true,
                 writable: true,
-                value: function () {
+                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()];
+                                case 0: return [4 /*yield*/, this.router.init(req, meta)];
                                 case 1:
                                     _b.sent();
-                                    this.ready = true;
                                     return [2 /*return*/];
                             }
                         });
@@ -134,14 +129,13 @@ export var system = provide((function () {
                 enumerable: false,
                 configurable: true,
                 writable: true,
-                value: function (params, request, permission) {
+                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),
-                        params: params,
-                        query: Object.fromEntries(new URL(request.url).searchParams),
+                        req: req,
                     };
                 }
             });
@@ -149,8 +143,8 @@ export var system = provide((function () {
         }()),
         (function () {
             var _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _router_decorators = [inject(routerSchema)];
-            _init_decorators = [loader.load(true)];
+            _router_decorators = [inject(RouterSchema)];
+            _init_decorators = [(_b = loader).once.bind(_b), 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 });

package/dist/router.js

@@ -51,15 +51,15 @@ import { DefaultOutlet } from "./components/DefaultOutlet";
 import { ErrorBoundary } from "./components/ErrorBoundary";
 import { ProgressLayout } from "./components/ProgressLayout";
 import { system } from "./models/system";
-var pages = import.meta.glob("/src/pages/**/index.tsx", {
+var pages = import.meta.glob("/src/**/pages/**/index.tsx", {
     eager: true,
     import: "Page",
 });
-var layouts = import.meta.glob("/src/pages/**/layout.tsx", {
+var layouts = import.meta.glob("/src/**/pages/**/layout.tsx", {
     eager: true,
     import: "Layout",
 });
-var metas = import.meta.glob("/src/pages/**/meta.ts", {
+var metas = import.meta.glob("/src/**/pages/**/meta.ts", {
     eager: true,
 });
 var routes = [];
@@ -85,25 +85,27 @@ filePaths.forEach(function (filePath) {
                 index: true,
                 loader: hasPage
                     ? function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-                        var ctx;
-                        var _c, _d, _e, _f;
+                        var url, req, ctx;
+                        var _c, _d, _e, _f, _g;
                         var params = _b.params, request = _b.request;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
+                        return __generator(this, function (_h) {
+                            switch (_h.label) {
                                 case 0:
-                                    if (!!system.ready) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, ((_c = system.init()) === null || _c === void 0 ? void 0 : _c.catch(function () { }))];
+                                    url = new URL(request.url);
+                                    req = {
+                                        params: params,
+                                        query: Object.fromEntries(url.searchParams),
+                                        pathname: url.pathname.replace(/\/?$/, "/"),
+                                    };
+                                    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:
-                                    _g.sent();
-                                    _g.label = 2;
+                                    _h.sent();
+                                    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 2:
-                                    ctx = system.getCtx(params, request, meta.permission);
-                                    return [4 /*yield*/, ((_f = (_e = (_d = meta.loader) === null || _d === void 0 ? void 0 : _d.call(meta, ctx, meta)) === null || _e === void 0 ? void 0 : _e.catch) === null || _f === void 0 ? void 0 : _f.call(_e, function () { }))];
-                                case 3:
-                                    _g.sent();
+                                    _h.sent();
                                     if (!ctx.signed) {
-                                        system.ready = false;
-                                        return [2 /*return*/, redirect("/login")];
+                                        return [2 /*return*/, redirect("/login?from=".concat(encodeURIComponent(request.url)))];
                                     }
                                     if (ctx.noPermission)
                                         return [2 /*return*/, redirect("/403")];

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e7w/easy-routes",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -10,6 +10,10 @@
     "types": "./dist/index.d.ts",
     "import": "./dist/index.js"
   },
+  "scripts": {
+    "build": "tsc --build && copyfiles -u 1 src/**/*.css dist/",
+    "lint": "eslint ."
+  },
   "dependencies": {
     "@e7w/easy-model": "^0.2.1",
     "nprogress": "^0.2.0",
@@ -40,9 +44,5 @@
     "README.md",
     "LICENSE.md"
   ],
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc --build && copyfiles -u 1 src/**/*.css dist/",
-    "lint": "eslint ."
-  }
+  "license": "MIT"
 }