@doracli/express 0.0.1 → 0.0.2

package/lib/cjs/index.js

@@ -68,26 +68,6 @@ function _toPropertyKey(t) {
   return "symbol" == typeof i ? i : i + "";
 }
 
-var Ctx = /*#__PURE__*/function () {
-  function Ctx(configCtx) {
-    _classCallCheck(this, Ctx);
-    _defineProperty(this, "configCtx", void 0);
-    _defineProperty(this, "envParams", {
-      scan: './',
-      workRootDir: filePro.getCwd()
-    });
-    /** 路由 -》文件夹/文件的映射 */
-    _defineProperty(this, "routePathMap", {});
-    this.configCtx = configCtx;
-  }
-  return _createClass(Ctx, [{
-    key: "updateEnvParams",
-    value: function updateEnvParams(params) {
-      this.envParams = _objectSpread2(_objectSpread2({}, this.envParams), params);
-    }
-  }]);
-}();
-
 var RouteManager = /*#__PURE__*/function () {
   function RouteManager(app) {
     _classCallCheck(this, RouteManager);
@@ -96,6 +76,11 @@ var RouteManager = /*#__PURE__*/function () {
     this.app = app;
   }
   return _createClass(RouteManager, [{
+    key: "check",
+    value: function check(route) {
+      return !!this.routesMap[route];
+    }
+  }, {
     key: "add",
     value: function add(route, method, handler) {
       this.updateMap(route, method, handler);
@@ -104,6 +89,10 @@ var RouteManager = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(route, method, handler) {
+      if (!this.check(route)) {
+        this.add(route, method, handler);
+        return;
+      }
       this.updateMap(route, method, handler, 'updated');
     }
   }, {
@@ -144,8 +133,34 @@ var RouteManager = /*#__PURE__*/function () {
   }]);
 }();
 
+var Ctx = /*#__PURE__*/function () {
+  function Ctx(configCtx, app) {
+    _classCallCheck(this, Ctx);
+    _defineProperty(this, "app", void 0);
+    _defineProperty(this, "routeManager", void 0);
+    _defineProperty(this, "configCtx", void 0);
+    _defineProperty(this, "envParams", {
+      scan: './',
+      workRootDir: filePro.getCwd()
+    });
+    this.configCtx = configCtx;
+    this.app = app;
+    this.routeManager = new RouteManager(app);
+  }
+  return _createClass(Ctx, [{
+    key: "updateEnvParams",
+    value: function updateEnvParams(params) {
+      this.envParams = _objectSpread2(_objectSpread2({}, this.envParams), params);
+    }
+
+    // getServiceConfig() {
+    //   return this.configCtx.getDoraConfig().serviceConfig!;
+    // }
+  }]);
+}();
+
 var loggerMiddleware = function loggerMiddleware(req, res, next) {
-  helper.cLog.log('ser', 'request', "Request: [".concat(req.method, "] ").concat(req.url));
+  helper.cLog.log('ser', 'request', "[".concat(req.method, "] ").concat(req.url));
   next();
 };
 

package/lib/esm/index.js

@@ -66,26 +66,6 @@ function _toPropertyKey(t) {
   return "symbol" == typeof i ? i : i + "";
 }
 
-var Ctx = /*#__PURE__*/function () {
-  function Ctx(configCtx) {
-    _classCallCheck(this, Ctx);
-    _defineProperty(this, "configCtx", void 0);
-    _defineProperty(this, "envParams", {
-      scan: './',
-      workRootDir: getCwd()
-    });
-    /** 路由 -》文件夹/文件的映射 */
-    _defineProperty(this, "routePathMap", {});
-    this.configCtx = configCtx;
-  }
-  return _createClass(Ctx, [{
-    key: "updateEnvParams",
-    value: function updateEnvParams(params) {
-      this.envParams = _objectSpread2(_objectSpread2({}, this.envParams), params);
-    }
-  }]);
-}();
-
 var RouteManager = /*#__PURE__*/function () {
   function RouteManager(app) {
     _classCallCheck(this, RouteManager);
@@ -94,6 +74,11 @@ var RouteManager = /*#__PURE__*/function () {
     this.app = app;
   }
   return _createClass(RouteManager, [{
+    key: "check",
+    value: function check(route) {
+      return !!this.routesMap[route];
+    }
+  }, {
     key: "add",
     value: function add(route, method, handler) {
       this.updateMap(route, method, handler);
@@ -102,6 +87,10 @@ var RouteManager = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(route, method, handler) {
+      if (!this.check(route)) {
+        this.add(route, method, handler);
+        return;
+      }
       this.updateMap(route, method, handler, 'updated');
     }
   }, {
@@ -142,8 +131,34 @@ var RouteManager = /*#__PURE__*/function () {
   }]);
 }();
 
+var Ctx = /*#__PURE__*/function () {
+  function Ctx(configCtx, app) {
+    _classCallCheck(this, Ctx);
+    _defineProperty(this, "app", void 0);
+    _defineProperty(this, "routeManager", void 0);
+    _defineProperty(this, "configCtx", void 0);
+    _defineProperty(this, "envParams", {
+      scan: './',
+      workRootDir: getCwd()
+    });
+    this.configCtx = configCtx;
+    this.app = app;
+    this.routeManager = new RouteManager(app);
+  }
+  return _createClass(Ctx, [{
+    key: "updateEnvParams",
+    value: function updateEnvParams(params) {
+      this.envParams = _objectSpread2(_objectSpread2({}, this.envParams), params);
+    }
+
+    // getServiceConfig() {
+    //   return this.configCtx.getDoraConfig().serviceConfig!;
+    // }
+  }]);
+}();
+
 var loggerMiddleware = function loggerMiddleware(req, res, next) {
-  cLog.log('ser', 'request', "Request: [".concat(req.method, "] ").concat(req.url));
+  cLog.log('ser', 'request', "[".concat(req.method, "] ").concat(req.url));
   next();
 };
 

package/lib/type/index.d.ts

@@ -1,6 +1,6 @@
 import { Application } from 'express';
-import { THandlerConfig, TMethod, TRouterHandlerFun, Request, Response } from '@doracli/define-server';
 import { ConfigCtx } from '@doracli/helper';
+import { TMethod, TControllerFun, Request, Response } from '@doracli/define-server';
 import { TNoop } from '@cclr/lang';
 
 declare const createServer: (config: {
@@ -14,34 +14,34 @@ type TEnvParams = {
     workRootDir: string;
 };
 
-declare class Ctx {
-    configCtx: ConfigCtx;
-    envParams: TEnvParams;
-    /** 路由 -》文件夹/文件的映射 */
-    routePathMap: Record<string, THandlerConfig>;
-    constructor(configCtx: ConfigCtx);
-    updateEnvParams(params: Partial<TEnvParams>): void;
-}
-
 declare class RouteManager {
     private app;
     private routesMap;
     constructor(app: Application);
-    add(route: string, method: TMethod, handler: TRouterHandlerFun): void;
-    update(route: string, method: TMethod, handler: TRouterHandlerFun): void;
+    check(route: string): boolean;
+    add(route: string, method: TMethod, handler: TControllerFun): void;
+    update(route: string, method: TMethod, handler: TControllerFun): void;
     remove(route: string, method: TMethod): void;
     destroy(): void;
     private updateMap;
     private getProxyHandler;
 }
 
+declare class Ctx {
+    app: Application;
+    routeManager: RouteManager;
+    configCtx: ConfigCtx;
+    envParams: TEnvParams;
+    constructor(configCtx: ConfigCtx, app: Application);
+    updateEnvParams(params: Partial<TEnvParams>): void;
+}
+
 declare const loggerMiddleware: (req: Request, res: Response, next: TNoop) => void;
 
 type THandlerOpt = {
     state: 'added' | 'updated' | 'removed';
-    handler: TRouterHandlerFun | null;
+    handler: TControllerFun | null;
 };
-type TMethodHandlerMap = Partial<Record<TMethod, TRouterHandlerFun>>;
 
 export { Ctx, RouteManager, createServer, loggerMiddleware };
-export type { TEnvParams, THandlerOpt, TMethodHandlerMap };
+export type { TEnvParams, THandlerOpt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doracli/express",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "use express",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
@@ -29,11 +29,11 @@
     "@cclr/lang": "^0.1.28",
     "@cclr/utils": "^0.1.28",
     "@dorabag/file-pro": "^1.0.10",
-    "@doracli/define-server": "0.0.1",
-    "@doracli/helper": "0.0.1",
-    "@doracli/type": "0.0.1",
-    "@types/express": "^5.0.3",
+    "@doracli/define-server": "0.0.2",
+    "@doracli/helper": "0.0.2",
+    "@doracli/type": "0.0.2",
+    "@types/express": "^5.0.4",
     "express": "^5.1.0"
   },
-  "gitHead": "40ab496f25042487a671979074515f3345c96453"
+  "gitHead": "912cb44292b64679630a799974d18c22b2e69738"
 }