@ldsg/route 0.3.9 → 0.3.17

package/dist/__tests__/e2e.js

@@ -7,45 +7,46 @@ const application_1 = require("@ldsg/application");
 const handler_1 = require("@ldsg/handler");
 const supertest_1 = __importDefault(require("supertest"));
 const resource_1 = require("../resource");
-const handler = (req, res) => {
-    res.send("Hello, World!");
+const handler = (params) => {
+    const { res } = params;
+    res.send('Hello, World!');
 };
-test("application", async () => {
+test('application', async () => {
     const applicationResource = new application_1.ApplicationResource({
-        id: "application",
-        kind: "application",
-        parentId: "root",
+        id: 'application',
+        kind: 'application',
+        parentId: 'root',
         settings: {
-            title: "应用",
-            description: "应用根资源",
-            name: "测试应用",
-        },
+            title: '应用',
+            description: '应用根资源',
+            name: '测试应用'
+        }
     });
     new resource_1.RouteResource({
-        id: "route",
-        kind: "route",
-        parentId: "application",
+        id: 'route',
+        kind: 'route',
+        parentId: 'application',
         settings: {
-            title: "应用",
-            description: "应用根资源",
-            path: "/test",
-            handlerResourceId: "route-test-app-test-handler",
-        },
+            title: '应用',
+            description: '应用根资源',
+            path: '/test',
+            handlerResourceId: 'route-test-app-test-handler'
+        }
     });
     new handler_1.HandlerResource({
-        id: "route-test-app-test-handler",
-        kind: "handler",
-        parentId: "root",
+        id: 'route-test-app-test-handler',
+        kind: 'handler',
+        parentId: 'root',
         settings: {
-            title: "应用",
-            description: "应用根资源",
-            code: "",
+            title: '应用',
+            description: '应用根资源',
+            code: '',
             dependencies: [],
-            handler,
-        },
+            handler
+        }
     });
     const app = applicationResource.createExpressApp();
-    const response = await (0, supertest_1.default)(app).get("/test");
+    const response = await (0, supertest_1.default)(app).get('/test');
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe("Hello, World!");
+    expect(response.text).toBe('Hello, World!');
 });

package/dist/constants.d.ts

@@ -1,6 +1,6 @@
-import { HandlerSpecificResourceSettings } from "@ldsg/handler";
-import { ResourceDefinitionSpecificResourceSettings } from "@ldsg/resource-definition";
-import { GeneralResourceSettings } from "@ldsg/types";
+import { HandlerSpecificResourceSettings } from '@ldsg/handler';
+import { ResourceDefinitionSpecificResourceSettings } from '@ldsg/resource-definition';
+import { GeneralResourceSettings } from '@ldsg/types';
 /**
  * Instantiate Resource Handler General Resource Settings
  * 实例化资源处理程序普通资源配置

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,sDAAsD,EAAE,uBAIlE,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,uDAAuD,EAAE,+BAQnE,CAAC;AAEJ,eAAO,MAAM,6CAA6C,EAAE,uBACtB,CAAC;AAEvC,eAAO,MAAM,8CAA8C,EAAE,0CAI1D,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,kDAAkD,EAAE,uBAI9D,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,mDAAmD,EAAE,+BAY/D,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,sDAAsD,EAAE,uBAGpE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uDAAuD,EAAE,+BAOrE,CAAC;AAEF,eAAO,MAAM,6CAA6C,EAAE,uBAG3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAE5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kDAAkD,EAAE,uBAGhE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mDAAmD,EAAE,+BAajE,CAAC"}

package/dist/constants.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_EXTENDED_HANDLER_SPECIFIC_RESOURCE_SETTINGS = exports.DEFAULT_EXTENDED_HANDLER_GENERAL_RESOURCE_SETTINGS = exports.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS = exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = void 0;
-const application_1 = require("@ldsg/application");
 /**
  * Instantiate Resource Handler General Resource Settings
  * 实例化资源处理程序普通资源配置
  */
 exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = {
-    title: "路由实例化资源处理程序",
-    description: "",
+    title: '路由实例化资源处理程序',
+    description: ''
 };
 /**
  * Instantiate Resource Handler Specific Resource Settings
@@ -19,36 +18,40 @@ exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = {
     code: `export * from "@ldsg/route";`,
     dependencies: [
         {
-            name: "@ldsg/route",
-        },
-    ],
+            name: '@ldsg/route'
+        }
+    ]
+};
+exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = {
+    title: '路由资源定义',
+    description: ''
 };
-exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = { title: "路由资源定义", description: "" };
 exports.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS = {
-    kind: "route",
-    parentKind: application_1.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS.kind,
+    kind: 'route'
 };
 /**
  * Default Extended Handler General Resource Settings
  * 默认扩展处理程序普通资源配置
  */
 exports.DEFAULT_EXTENDED_HANDLER_GENERAL_RESOURCE_SETTINGS = {
-    title: "路由默认扩展处理程序",
-    description: "",
+    title: '路由默认扩展处理程序',
+    description: ''
 };
 /**
  * Default Extended Handler Specific Resource Settings
  * 默认扩展处理程序特殊资源配置
  */
 exports.DEFAULT_EXTENDED_HANDLER_SPECIFIC_RESOURCE_SETTINGS = {
-    code: `import { RequestHandler } from "express";
+    code: `import { RouteResourceExtendedHandler } from "@ldsg/route";
+
+export const handler: RouteResourceExtendedHandler = (params) => {
+  const { req, res } = params
 
-const handler: RequestHandler = (req, res) => {
   res.send("Hello, World!");
 };`,
     dependencies: [
         {
-            name: "express",
-        },
-    ],
+            name: 'express'
+        }
+    ]
 };

package/dist/handler.d.ts

@@ -1,8 +1,6 @@
-import { Handler, HandlerExtendedResourceSettings } from "@ldsg/handler";
-import { InstantiateResourceParams, InstantiateResourceRes } from "@ldsg/resource";
-import { RouteResource } from "./resource";
-import { RouteSpecificResourceSettings } from "./types";
-export declare const handler: Handler<[
-    InstantiateResourceParams<HandlerExtendedResourceSettings<RouteSpecificResourceSettings>>
-], InstantiateResourceRes<RouteResource>>;
+import { Handler, HandlerExtendedResourceSettings } from '@ldsg/handler';
+import { InstantiateResourceParams, InstantiateResourceRes } from '@ldsg/resource';
+import { RouteResource } from './resource';
+import { RouteSpecificResourceSettings } from './types';
+export declare const handler: Handler<InstantiateResourceParams<HandlerExtendedResourceSettings<RouteSpecificResourceSettings>>, InstantiateResourceRes<RouteResource>>;
 //# sourceMappingURL=handler.d.ts.map

package/dist/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,eAAO,MAAM,OAAO,EAAE,OAAO,CAC3B;IACE,yBAAyB,CACvB,+BAA+B,CAAC,6BAA6B,CAAC,CAC/D;CACF,EACD,sBAAsB,CAAC,aAAa,CAAC,CAChB,CAAC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,eAAO,MAAM,OAAO,EAAE,OAAO,CAC3B,yBAAyB,CAAC,+BAA+B,CAAC,6BAA6B,CAAC,CAAC,EACzF,sBAAsB,CAAC,aAAa,CAAC,CAChB,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./constants";
-export * from "./handler";
-export * from "./instantiate-resource";
-export * from "./resource";
-export * from "./types";
+export * from './constants';
+export * from './handler';
+export * from './instantiate-resource';
+export * from './resource';
+export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/instantiate-resource.d.ts

@@ -1,6 +1,6 @@
-import { HandlerExtendedResourceSettings } from "@ldsg/handler";
-import { InstantiateResource } from "@ldsg/resource";
-import { RouteResource } from "./resource";
-import { RouteSpecificResourceSettings } from "./types";
+import { HandlerExtendedResourceSettings } from '@ldsg/handler';
+import { InstantiateResource } from '@ldsg/resource';
+import { RouteResource } from './resource';
+import { RouteSpecificResourceSettings } from './types';
 export declare const instantiateResource: InstantiateResource<HandlerExtendedResourceSettings<RouteSpecificResourceSettings>, RouteResource>;
 //# sourceMappingURL=instantiate-resource.d.ts.map

package/dist/instantiate-resource.js

@@ -6,7 +6,7 @@ const instantiateResource = (params) => {
     const { resourceConstructorParams } = params;
     const resource = new resource_1.RouteResource(resourceConstructorParams);
     const res = {
-        resource,
+        resource
     };
     return res;
 };

package/dist/resource.d.ts

@@ -1,6 +1,6 @@
-import { ExtendExpressApp } from "@ldsg/application";
-import { HandlerExtendedResource } from "@ldsg/handler";
-import { RouteSpecificResourceSettings } from "./types";
+import { ExtendExpressApp } from '@ldsg/application';
+import { HandlerExtendedResource } from '@ldsg/handler';
+import { RouteSpecificResourceSettings } from './types';
 export declare class RouteResource extends HandlerExtendedResource<RouteSpecificResourceSettings> {
     extendExpressApp: ExtendExpressApp;
 }

package/dist/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,qBAAa,aAAc,SAAQ,uBAAuB,CAAC,6BAA6B,CAAC;IACvF,gBAAgB,EAAE,gBAAgB,CAWhC;CACH"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAExD,qBAAa,aAAc,SAAQ,uBAAuB,CAAC,6BAA6B,CAAC;IACvF,gBAAgB,EAAE,gBAAgB,CAchC;CACH"}

package/dist/resource.js

@@ -7,9 +7,13 @@ class RouteResource extends handler_1.HandlerExtendedResource {
         super(...arguments);
         this.extendExpressApp = async (params) => {
             const { app } = params;
-            const { settings: { path }, getExtendedHandler, } = this;
-            const extendedHandler = getExtendedHandler();
-            app.all(path, extendedHandler);
+            const { settings: { path }, executeExtendedHandler } = this;
+            app.all(path, async (req, res) => {
+                await executeExtendedHandler({
+                    req,
+                    res
+                });
+            });
         };
     }
 }

package/dist/types/index.d.ts

@@ -1,2 +1,3 @@
-export * from "./specific-resource-settings";
+export * from './resource-extended-handler';
+export * from './specific-resource-settings';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC"}

package/dist/types/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./resource-extended-handler"), exports);
 __exportStar(require("./specific-resource-settings"), exports);

package/dist/types/resource-extended-handler.d.ts

@@ -0,0 +1,9 @@
+import { ResourceExtendedHandler } from '@ldsg/handler';
+import { Request, Response } from 'express';
+interface RouteResourceExtendedHandlerParams {
+    req: Request;
+    res: Response;
+}
+export type RouteResourceExtendedHandler = ResourceExtendedHandler<RouteResourceExtendedHandlerParams, void>;
+export {};
+//# sourceMappingURL=resource-extended-handler.d.ts.map

package/dist/types/resource-extended-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-extended-handler.d.ts","sourceRoot":"","sources":["../../src/types/resource-extended-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,UAAU,kCAAkC;IAC1C,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAC"}

package/dist/types/resource-extended-handler.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/specific-resource-settings.d.ts

@@ -1,4 +1,4 @@
-import { SpecificResourceSettings } from "@ldsg/types";
+import { SpecificResourceSettings } from '@ldsg/types';
 export interface RouteSpecificResourceSettings extends SpecificResourceSettings {
     /**
      * Route Path

package/dist/types/specific-resource-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,6BACf,SAAQ,wBAAwB;IAChC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd"}
+{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,6BAA8B,SAAQ,wBAAwB;IAC7E;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd"}

package/package.json

@@ -1,33 +1,39 @@
 {
   "name": "@ldsg/route",
-  "version": "0.3.9",
+  "version": "0.3.17",
   "description": "",
+  "keywords": [],
+  "license": "MIT",
+  "author": "wanxger",
   "main": "dist/index.js",
+  "types": "dist",
   "files": [
     "dist/"
   ],
-  "types": "dist",
-  "keywords": [],
-  "author": "wanxger",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@ldsg/handler": "0.3.9",
-    "@ldsg/resource": "0.3.9",
-    "@ldsg/resource-definition": "0.3.9"
+    "@ldsg/handler": "0.3.17",
+    "@ldsg/resource": "0.3.17",
+    "@ldsg/resource-definition": "0.3.17"
   },
   "devDependencies": {
-    "@types/express": "^5.0.1",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^29.5.2",
     "@types/supertest": "^6.0.0",
+    "express": "^4.18.2",
+    "jest": "^29.5.0",
     "supertest": "^6.3.4",
-    "express": "^5.1.0",
-    "@ldsg/application": "0.3.9",
-    "@ldsg/types": "0.3.9"
+    "ts-jest": "^29.1.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3",
+    "@ldsg/application": "0.3.17",
+    "@ldsg/types": "0.3.17"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
-    "clean": "rm -rf dist"
+    "clean": "rm -rf dist",
+    "test": "jest"
   }
 }