@fy-tools/rpc-server-expressjs 0.0.119-alpha.10390 → 0.0.119-alpha.10391

package/dist/lib/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,GAAG,CAAC,UAAU,SAAS,WAAW,GAAG,WAAW,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM;IAYxE,IAAI,EAAE,UAAU;IAAS,OAAO,EAAE,MAAM;IAX3D;;;SAGK;IACE,CAAC,EAAS,GACd,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CACrE,UAAU,EACV,oBAAoB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAC1D,GACF,CAAC;gBAEiB,IAAI,EAAE,UAAU,EAAS,OAAO,EAAE,MAAM;IAY3D,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,CAAC;CAGxD"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,GAAG,CAAC,UAAU,SAAS,WAAW,GAAG,WAAW,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM;IAYxE,IAAI,EAAE,UAAU;IAAS,OAAO,EAAE,MAAM;IAX3D;;;SAGK;IACE,CAAC,EAAS,GACd,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CACrE,UAAU,EACV,oBAAoB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAC1D,GACF,CAAC;gBAEiB,IAAI,EAAE,UAAU,EAAS,OAAO,EAAE,MAAM;IAS3D,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,CAAC;CAGxD"}

package/dist/lib/app.js

@@ -14,9 +14,7 @@ class App {
         this._app = _app;
         this._schema = _schema;
         for (const i in _schema._controllers_map) {
-            const controller = new controller_1.Controller(this._app, _schema._controllers[_schema._controllers_map[i]]);
-            this._app = controller._app;
-            this.C[i] = controller;
+            this.C[i] = new controller_1.Controller(this._app, _schema._controllers[_schema._controllers_map[i]]);
         }
     }
     build(fn) {

package/dist/lib/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/lib/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGnD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,UAAU,CACrB,GAAG,SAAS,WAAW,GAAG,WAAW,EACrC,MAAM,SAAS,aAAa,GAAG,aAAa;IAQzB,IAAI,EAAE,GAAG;IAAS,OAAO,EAAE,MAAM;IANpD;;;SAGK;IACE,CAAC,KAuBD,GAAG,iHAvBD;gBAEU,IAAI,EAAE,GAAG,EAAS,OAAO,EAAE,MAAM;IAkCpD,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;CAGjD"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/lib/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGnD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,UAAU,CACrB,GAAG,SAAS,WAAW,GAAG,WAAW,EACrC,MAAM,SAAS,aAAa,GAAG,aAAa;IAQzB,IAAI,EAAE,GAAG;IAAS,OAAO,EAAE,MAAM;IANpD;;;SAGK;IACE,CAAC,KAkBD,GAAG,iHAlBD;gBAEU,IAAI,EAAE,GAAG,EAAS,OAAO,EAAE,MAAM;IA6BpD,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;CAGjD"}

package/dist/lib/controller.js

@@ -17,14 +17,13 @@ class Controller {
         this._schema = _schema;
         const router = express_1.default.Router();
         const routes = {};
-        let currentRouter = router;
         for (const i in _schema._routes_map) {
-            const route = new route_1.Route(currentRouter, _schema._routes[_schema._routes_map[i]]);
-            currentRouter = route._app;
-            routes[i] = route;
+            routes[i] = new route_1.Route(router, _schema._routes[_schema._routes_map[i]]);
         }
-        const basePath = this._schema._basePath ? `/${this._schema._basePath}` : '/';
-        this._app.use(basePath, currentRouter);
+        const basePath = this._schema._basePath
+            ? `/${this._schema._basePath}`
+            : '/';
+        this._app.use(basePath, router);
         this.R = new Proxy(routes, {
             get(target, p) {
                 return routes[p];

package/dist/lib/route.d.ts

@@ -1,10 +1,9 @@
 import { AnyRoute, Response } from '@fy-tools/rpc-server';
 import type { Router } from 'express';
-import type { RouteToContext } from './types';
+import { RouteToContext } from './types';
 export declare class Route<App extends Router = Router, Schema extends AnyRoute = AnyRoute> {
     _app: App;
     _schema: Schema;
-    private readonly _handlerRef;
     constructor(_app: App, _schema: Schema);
     build<T extends Router>(fn: (app: App) => T): Route<T, Schema>;
     handler(fn: (ctx: RouteToContext<Schema>) => Promise<Response<Schema>>): void;

package/dist/lib/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/lib/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,EAIV,MAAM,EACP,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,KAAK,CAChB,GAAG,SAAS,MAAM,GAAG,MAAM,EAC3B,MAAM,SAAS,QAAQ,GAAG,QAAQ;IAMf,IAAI,EAAE,GAAG;IAAS,OAAO,EAAE,MAAM;IAJpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAE1B;gBAEiB,IAAI,EAAE,GAAG,EAAS,OAAO,EAAE,MAAM;IAiEpD,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAI3C,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAIvE"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/lib/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,EAIV,MAAM,EACP,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,KAAK,CAChB,GAAG,SAAS,MAAM,GAAG,MAAM,EAC3B,MAAM,SAAS,QAAQ,GAAG,QAAQ;IAEf,IAAI,EAAE,GAAG;IAAS,OAAO,EAAE,MAAM;gBAAjC,IAAI,EAAE,GAAG,EAAS,OAAO,EAAE,MAAM;IAEpD,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAI3C,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAuDvE"}

package/dist/lib/route.js

@@ -5,21 +5,17 @@ const rpc_server_1 = require("@fy-tools/rpc-server");
 class Route {
     _app;
     _schema;
-    _handlerRef;
     constructor(_app, _schema) {
         this._app = _app;
         this._schema = _schema;
-        this._handlerRef = {
-            fn: () => {
-                throw new Error('Route handler not implemented');
-            },
-        };
-        // Capture ref object — closure reads handlerRef.fn, not this._handlerFn,
-        // so reassignment in handler() is always visible even if this-binding diverges.
-        const handlerRef = this._handlerRef;
+    }
+    build(fn) {
+        return new Route(fn(this._app), this._schema);
+    }
+    handler(fn) {
         const path = this._schema._path ? `/${this._schema._path}` : '/';
         const method = this._schema._method;
-        this._app = this._app[method](path, async (req, res, next) => {
+        this._app[method](path, async (req, res, next) => {
             try {
                 let body = req.body;
                 let params = req.params;
@@ -42,13 +38,13 @@ class Route {
                         return next(new rpc_server_1.ValidationError(result.issues));
                     query = result.value;
                 }
-                console.log('handlerFn', handlerRef.fn);
-                const response = await handlerRef.fn({
+                const response = await fn({
                     body,
                     params,
                     query,
                     req,
                     res,
+                    next,
                 });
                 if (!res.headersSent)
                     res.json(response);
@@ -58,12 +54,5 @@ class Route {
             }
         });
     }
-    build(fn) {
-        return new Route(fn(this._app), this._schema);
-    }
-    handler(fn) {
-        console.log('handler set ', fn);
-        this._handlerRef.fn = fn;
-    }
 }
 exports.Route = Route;

package/dist/lib/types.d.ts

@@ -1,10 +1,11 @@
 import type { AnyRoute, Body, Params, Query } from '@fy-tools/rpc-server';
-import type { Request, Response } from 'express';
+import type { NextFunction, Request, Response } from 'express';
 export type RouteToContext<Schema extends AnyRoute> = {
     body: Body<Schema>;
     params: Params<Schema>;
     query: Query<Schema>;
     req: Request;
     res: Response;
+    next: NextFunction;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEjD,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,QAAQ,IAAI;IACpD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,QAAQ,IAAI;IACpD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-tools/rpc-server-expressjs",
-  "version": "0.0.119-alpha.10390",
+  "version": "0.0.119-alpha.10391",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/festusyuma/fy-tools.git",
@@ -22,7 +22,7 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@fy-tools/rpc-server": "0.0.119-alpha.10390",
+    "@fy-tools/rpc-server": "0.0.119-alpha.10391",
     "express": "^4.21.2",
     "tslib": "^2.3.0"
   },