@fastcar/koa 0.1.12 → 0.1.14

package/index.d.ts

@@ -60,4 +60,7 @@ export function KoaStatic(app: FastCarApplication): MiddleWareType;
 //支持api说明
 export function Swagger(app: FastCarApplication): MiddleWareType;
 
+//增强multi文件解析
+export function KoaMulter(app: FastCarApplication): MiddleWareType;
+
 export * from "./src/type/DesignMeta";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/koa",
-	"version": "0.1.12",
+	"version": "0.1.14",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"description": "fastcar框架下对koa的包装",
 	"main": "target/index.js",
@@ -30,17 +30,18 @@
 		"node": ">=16"
 	},
 	"devDependencies": {
-		"@fastcar/core": "^0.2.38",
+		"@fastcar/core": "0.3.1",
 		"@fastcar/server": "^0.0.3",
 		"@types/koa": "^2.13.5",
-		"reflect-metadata": "^0.1.13",
 		"@types/koa-bodyparser": "^4.3.11",
-		"@types/koa-router": "^7.4.6"
+		"@types/koa-router": "^7.4.6",
+		"@types/koa__multer": "*",
+		"reflect-metadata": "*"
 	},
 	"dependencies": {
-		"koa": "^2.13.1",
+		"koa": "^2.15.3",
 		"koa-bodyparser": "^4.4.1",
-		"koa-router": "^12.0.1"
+		"koa-router": "^13.0.1"
 	},
 	"peerDependencies": {
 		"@fastcar/core": "*",
@@ -58,9 +59,8 @@
 		"koa-range": "^0.3.0",
 		"koa-static": "^5.0.0",
 		"koa2-cors": "^2.0.6",
-		"swagger-ui-dist": "4.5.0",
-		"@types/koa__multer": "*",
-		"multer": "*"
+		"multer": "*",
+		"swagger-ui-dist": "4.5.0"
 	},
 	"peerDependenciesMeta": {
 		"@types/koa-bodyparser": {

package/src/annotation.ts

@@ -8,7 +8,6 @@ import PatchMapping from "./annotation/router/PatchMapping";
 import PostMapping from "./annotation/router/PostMapping";
 import PutMapping from "./annotation/router/PutMapping";
 import RequestMapping from "./annotation/router/RequestMapping";
-import KoaMulter from "./middleware/KoaMulter";
 
 //声明简化的方式
 const GET = GetMapping;
@@ -41,5 +40,4 @@ export {
 	PATCH,
 	ALL,
 	REQUEST,
-	KoaMulter,
 };

package/src/index.ts

@@ -5,7 +5,7 @@ import KoaBody from "./middleware/KoaBody";
 import KoaBodyParser from "./middleware/KoaBodyParser";
 import KoaCors from "./middleware/KoaCors";
 import KoaStatic from "./middleware/KoaStatic";
-import Swagger from "./middleware/Swagger";
 import { DesignMeta } from "./type/DesignMeta";
+import KoaMulter from "./middleware/KoaMulter";
 
-export { KoaApplication, KoaConfig, ExceptionGlobalHandler, KoaBody, KoaBodyParser, KoaCors, KoaStatic, Swagger, DesignMeta };
+export { KoaApplication, KoaConfig, ExceptionGlobalHandler, KoaBody, KoaBodyParser, KoaCors, KoaStatic, KoaMulter, DesignMeta };

package/src/middleware/ExceptionGlobalHandler.ts

@@ -2,7 +2,7 @@ import { FastCarApplication, ValidError } from "@fastcar/core";
 
 //默认错误捕捉
 export default function ExceptionGlobalHandler(app: FastCarApplication) {
-	let logger = app.getSysLogger();
+	const logger = app.getSysLogger();
 	return async (ctx: any, next: Function) => {
 		try {
 			await next();

package/src/middleware/KoaBody.ts

@@ -1,11 +1,12 @@
-import * as koaBody from "koa-body";
 import { FastCarApplication } from "@fastcar/core";
 import { KoaConfig } from "../type/KoaConfig";
 
 //对于文件上传做限定
 export default function KoaBody(app: FastCarApplication) {
+	const koaBodyfn = require("koa-body").default;
+
 	let koaConfig: KoaConfig = app.getSetting("koa");
 	let bodyConfig = koaConfig?.koaBodyOptions;
 
-	return koaBody(bodyConfig);
+	return koaBodyfn(bodyConfig);
 }

package/src/middleware/KoaBodyParser.ts

@@ -1,9 +1,10 @@
-import * as bodyParser from "koa-bodyparser";
 import { FastCarApplication } from "@fastcar/core";
 import { KoaConfig } from "../type/KoaConfig";
 
 //对文件内容做解析
 export default function KoaBodyParser(app: FastCarApplication) {
+	const bodyParser = require("koa-bodyparser");
+
 	let koaConfig: KoaConfig = app.getSetting("koa");
 	let bodyConfig = koaConfig?.koaBodyParser;
 

package/src/middleware/KoaCors.ts

@@ -1,12 +1,13 @@
 import { FastCarApplication } from "@fastcar/core";
-import * as koa2Cors from "koa2-cors";
 import { KoaConfig } from "../type/KoaConfig";
 import { Context } from "koa";
 
 export default function KoaCors(app: FastCarApplication) {
+	const koa2Cors = require("koa2-cors");
+
 	let koaConfig: KoaConfig = app.getSetting("koa");
 	if (koaConfig?.extra) {
-		let corsConfig: koa2Cors.Options = Reflect.get(koaConfig.extra, "cors");
+		let corsConfig = Reflect.get(koaConfig.extra, "cors");
 		if (!!corsConfig) {
 			//兼容支持多个跨域
 			if (typeof corsConfig.origin == "string") {

package/src/middleware/KoaMulter.ts

@@ -1,7 +1,8 @@
-import * as multer from "@koa/multer";
 import { FastCarApplication } from "@fastcar/core";
 
 //对文件内容做解析
 export default function KoaMulter(app: FastCarApplication) {
+	const multer = require("@koa/multer");
+
 	return multer().single();
 }

package/src/middleware/KoaStatic.ts

@@ -1,6 +1,3 @@
-import * as koaStatic from "koa-static";
-import * as KoaRange from "koa-range";
-import * as KoaMount from "koa-mount";
 import { FastCarApplication } from "@fastcar/core";
 import { KoaConfig } from "../type/KoaConfig";
 import * as fs from "fs";
@@ -9,6 +6,8 @@ import * as Koa from "koa";
 
 //支持静态文件访问
 export default function KoaStatic(app: FastCarApplication): Koa.Middleware[] {
+	const KoaRange = require("koa-range");
+
 	let mlist: Koa.Middleware[] = [];
 
 	//采用koa-range使文件可以流式传播
@@ -17,6 +16,9 @@ export default function KoaStatic(app: FastCarApplication): Koa.Middleware[] {
 	let koaConfig: KoaConfig = app.getSetting("koa");
 
 	if (!!koaConfig?.koaStatic) {
+		const KoaMount = require("koa-mount").default;
+		const koaStatic = require("koa-static").default;
+
 		let keys = Object.keys(koaConfig?.koaStatic);
 		if (keys.length > 0) {
 			for (let key of keys) {

package/src/type/KoaConfig.ts

@@ -1,13 +1,10 @@
-import * as koaBody from "koa-body";
-import * as bodyParser from "koa-bodyparser";
 import { ServerConfig } from "@fastcar/server";
 
 //和koa的约定配置
 export type KoaConfig = {
 	server: ServerConfig[] | ServerConfig; //监听的端口号
 	koaStatic?: { [key: string]: string }; //相对路径为resource下的 或者绝对文件路径
-	koaBodyOptions?: koaBody.IKoaBodyOptions; //文件上传的解析
-	koaBodyParser?: bodyParser.Options; //解析请求
+	koaBodyOptions?: { [key: string]: any }; //文件上传的解析
+	koaBodyParser?: { [key: string]: any }; //bodyParser.Options; //解析请求
 	extra?: { [key: string]: any }; //拓展设置
-	swagger?: { enable: boolean; api: { [alias: string]: string } }; //别名:路径
 };

package/target/KoaApplication.js

@@ -1,143 +1,147 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("reflect-metadata");
-const annotation_1 = require("@fastcar/core/annotation");
-const core_1 = require("@fastcar/core");
-const Koa = require("koa");
-const KoaRouter = require("koa-router");
-const DesignMeta_1 = require("./type/DesignMeta");
-const utils_1 = require("@fastcar/core/utils");
-const server_1 = require("@fastcar/server");
-/***
- * @version 1.0 koa基础组件启动
- *
- */
-let KoaApplication = class KoaApplication {
-    constructor() {
-        this.koaApp = new Koa();
-    }
-    /***
-     * @version 1.0 加载中间件
-     *
-     */
-    loadMiddleWare(list) {
-        if (Array.isArray(list)) {
-            list.forEach((item) => {
-                if (utils_1.TypeUtil.isFunction(item)) {
-                    this.koaApp.use(item);
-                }
-            });
-        }
-        else {
-            if (utils_1.TypeUtil.isFunction(list)) {
-                this.koaApp.use(list);
-            }
-        }
-    }
-    /***
-     * @version 1.0 加载路由
-     *
-     */
-    loadRoute() {
-        let router = new KoaRouter();
-        let instanceList = this.app.getComponentByType(core_1.ComponentKind.Controller);
-        //查找绑定的url
-        instanceList.forEach((instance) => {
-            let routerMap = Reflect.getMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, instance);
-            //移除空的map结构
-            if (!routerMap || routerMap.size == 0) {
-                return;
-            }
-            routerMap.forEach((item) => {
-                //去除ctx的影响
-                let callBack = async (ctx, next) => {
-                    //进行参数的取值
-                    let body = {};
-                    //自动合并传参 如果有重合的部分 需要再次单独取就好了
-                    if (Object.keys(ctx.query).length > 0) {
-                        Object.assign(body, ctx.query);
-                    }
-                    if (!!ctx.request.body) {
-                        Object.assign(body, ctx.request.body);
-                    }
-                    if (!!ctx.params) {
-                        Object.assign(body, ctx.params);
-                    }
-                    let res = await instance[item.method](body, ctx);
-                    if (utils_1.ValidationUtil.isNotNull(res)) {
-                        ctx.body = res;
-                    }
-                    if (next) {
-                        await next();
-                    }
-                };
-                for (let r of item.request) {
-                    //进行绑定 加载router路由的执行方法
-                    Reflect.apply(router[`${r}`], router, [item.url, callBack]);
-                }
-            });
-        });
-        return router.routes();
-    }
-    start() {
-        const koaApp = this.koaApp;
-        //加载中间件
-        let middlewareList = this.app.getSetting(DesignMeta_1.DesignMeta.KoaMIDDLEWARE);
-        if (Array.isArray(middlewareList)) {
-            for (let m of middlewareList) {
-                if (utils_1.TypeUtil.isPromise(m)) {
-                    Reflect.apply(m, this, [this.app, koaApp]).then((tmpList) => {
-                        this.loadMiddleWare(tmpList);
-                    });
-                }
-                else {
-                    let tmpList = Reflect.apply(m, this, [this.app, koaApp]);
-                    this.loadMiddleWare(tmpList);
-                }
-            }
-        }
-        //加载路由
-        koaApp.use(this.loadRoute());
-        //读取配置文件 创建服务器
-        let appCallback = koaApp.callback();
-        let koaConfig = this.app.getSetting("koa");
-        if (!!koaConfig.server) {
-            if (Array.isArray(koaConfig.server)) {
-                koaConfig.server.forEach((server) => {
-                    this.serverApplication.createServer(server, appCallback);
-                });
-            }
-            else {
-                this.serverApplication.createServer(koaConfig.server, appCallback);
-            }
-        }
-    }
-    async stop() { }
-};
-__decorate([
-    annotation_1.Autowired,
-    __metadata("design:type", core_1.FastCarApplication)
-], KoaApplication.prototype, "app", void 0);
-__decorate([
-    (0, annotation_1.Log)("koa"),
-    __metadata("design:type", core_1.Logger)
-], KoaApplication.prototype, "koaLogger", void 0);
-__decorate([
-    annotation_1.Autowired,
-    __metadata("design:type", server_1.ServerApplication)
-], KoaApplication.prototype, "serverApplication", void 0);
-KoaApplication = __decorate([
-    (0, annotation_1.ApplicationStart)(core_1.BootPriority.Lowest, "start"),
-    (0, annotation_1.ApplicationStop)(core_1.BootPriority.Base, "stop"),
-    __metadata("design:paramtypes", [])
-], KoaApplication);
-exports.default = KoaApplication;
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const annotation_1 = require("@fastcar/core/annotation");
+const core_1 = require("@fastcar/core");
+const Koa = require("koa");
+const KoaRouter = require("koa-router");
+const DesignMeta_1 = require("./type/DesignMeta");
+const utils_1 = require("@fastcar/core/utils");
+const server_1 = require("@fastcar/server");
+/***
+ * @version 1.0 koa基础组件启动
+ *
+ */
+let KoaApplication = class KoaApplication {
+    app;
+    koaLogger;
+    koaApp;
+    serverApplication;
+    constructor() {
+        this.koaApp = new Koa();
+    }
+    /***
+     * @version 1.0 加载中间件
+     *
+     */
+    loadMiddleWare(list) {
+        if (Array.isArray(list)) {
+            list.forEach((item) => {
+                if (utils_1.TypeUtil.isFunction(item)) {
+                    this.koaApp.use(item);
+                }
+            });
+        }
+        else {
+            if (utils_1.TypeUtil.isFunction(list)) {
+                this.koaApp.use(list);
+            }
+        }
+    }
+    /***
+     * @version 1.0 加载路由
+     *
+     */
+    loadRoute() {
+        let router = new KoaRouter();
+        let instanceList = this.app.getComponentByType(core_1.ComponentKind.Controller);
+        //查找绑定的url
+        instanceList.forEach((instance) => {
+            let routerMap = Reflect.getMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, instance);
+            //移除空的map结构
+            if (!routerMap || routerMap.size == 0) {
+                return;
+            }
+            routerMap.forEach((item) => {
+                //去除ctx的影响
+                let callBack = async (ctx, next) => {
+                    //进行参数的取值
+                    let body = {};
+                    //自动合并传参 如果有重合的部分 需要再次单独取就好了
+                    if (Object.keys(ctx.query).length > 0) {
+                        Object.assign(body, ctx.query);
+                    }
+                    if (!!ctx.request.body) {
+                        Object.assign(body, ctx.request.body);
+                    }
+                    if (!!ctx.params) {
+                        Object.assign(body, ctx.params);
+                    }
+                    let res = await instance[item.method](body, ctx);
+                    if (utils_1.ValidationUtil.isNotNull(res)) {
+                        ctx.body = res;
+                    }
+                    if (next) {
+                        await next();
+                    }
+                };
+                for (let r of item.request) {
+                    //进行绑定 加载router路由的执行方法
+                    Reflect.apply(router[`${r}`], router, [item.url, callBack]);
+                }
+            });
+        });
+        return router.routes();
+    }
+    start() {
+        const koaApp = this.koaApp;
+        //加载中间件
+        let middlewareList = this.app.getSetting(DesignMeta_1.DesignMeta.KoaMIDDLEWARE);
+        if (Array.isArray(middlewareList)) {
+            for (let m of middlewareList) {
+                if (utils_1.TypeUtil.isPromise(m)) {
+                    Reflect.apply(m, this, [this.app, koaApp]).then((tmpList) => {
+                        this.loadMiddleWare(tmpList);
+                    });
+                }
+                else {
+                    let tmpList = Reflect.apply(m, this, [this.app, koaApp]);
+                    this.loadMiddleWare(tmpList);
+                }
+            }
+        }
+        //加载路由
+        koaApp.use(this.loadRoute());
+        //读取配置文件 创建服务器
+        let appCallback = koaApp.callback();
+        let koaConfig = this.app.getSetting("koa");
+        if (!!koaConfig.server) {
+            if (Array.isArray(koaConfig.server)) {
+                koaConfig.server.forEach((server) => {
+                    this.serverApplication.createServer(server, appCallback);
+                });
+            }
+            else {
+                this.serverApplication.createServer(koaConfig.server, appCallback);
+            }
+        }
+    }
+    async stop() { }
+};
+__decorate([
+    annotation_1.Autowired,
+    __metadata("design:type", core_1.FastCarApplication)
+], KoaApplication.prototype, "app", void 0);
+__decorate([
+    (0, annotation_1.Log)("koa"),
+    __metadata("design:type", core_1.Logger)
+], KoaApplication.prototype, "koaLogger", void 0);
+__decorate([
+    annotation_1.Autowired,
+    __metadata("design:type", server_1.ServerApplication)
+], KoaApplication.prototype, "serverApplication", void 0);
+KoaApplication = __decorate([
+    (0, annotation_1.ApplicationStart)(core_1.BootPriority.Lowest, "start"),
+    (0, annotation_1.ApplicationStop)(core_1.BootPriority.Base, "stop"),
+    __metadata("design:paramtypes", [])
+], KoaApplication);
+exports.default = KoaApplication;

package/target/annotation/EnableKoa.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const annotation_1 = require("@fastcar/core/annotation");
-const server_1 = require("@fastcar/server");
-//开启koa应用
-function EnableKoa(target) {
-    let fp = require.resolve("../KoaApplication");
-    (0, annotation_1.ComponentInjection)(target, fp);
-    (0, server_1.EnableServer)(target);
-}
-exports.default = EnableKoa;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = EnableKoa;
+const annotation_1 = require("@fastcar/core/annotation");
+const server_1 = require("@fastcar/server");
+//开启koa应用
+function EnableKoa(target) {
+    let fp = require.resolve("../KoaApplication");
+    (0, annotation_1.ComponentInjection)(target, fp);
+    (0, server_1.EnableServer)(target);
+}

package/target/annotation/KoaMiddleware.js

@@ -1,19 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("reflect-metadata");
-const DesignMeta_1 = require("../type/DesignMeta");
-//加载koa中间件
-function KoaMiddleware(...args) {
-    return function (target) {
-        let middlewareList = Reflect.get(target.prototype, DesignMeta_1.DesignMeta.KoaMIDDLEWARE);
-        if (!middlewareList) {
-            middlewareList = args;
-        }
-        else {
-            //由于注解方式是从下至上运行 和我们理解的书写习惯不一样，所以这边做了一个反序
-            middlewareList = [...args, ...middlewareList];
-        }
-        Reflect.set(target.prototype, DesignMeta_1.DesignMeta.KoaMIDDLEWARE, middlewareList);
-    };
-}
-exports.default = KoaMiddleware;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = KoaMiddleware;
+require("reflect-metadata");
+const DesignMeta_1 = require("../type/DesignMeta");
+//加载koa中间件
+function KoaMiddleware(...args) {
+    return function (target) {
+        let middlewareList = Reflect.get(target.prototype, DesignMeta_1.DesignMeta.KoaMIDDLEWARE);
+        if (!middlewareList) {
+            middlewareList = args;
+        }
+        else {
+            //由于注解方式是从下至上运行 和我们理解的书写习惯不一样，所以这边做了一个反序
+            middlewareList = [...args, ...middlewareList];
+        }
+        Reflect.set(target.prototype, DesignMeta_1.DesignMeta.KoaMIDDLEWARE, middlewareList);
+    };
+}

package/target/annotation/router/AddMapping.js

@@ -1,29 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("reflect-metadata");
-const DesignMeta_1 = require("../../type/DesignMeta");
-function AddMapping(target, info) {
-    if (!info.url) {
-        info.url = info.method;
-    }
-    //格式化url 以/开头
-    if (!info.url.startsWith("/")) {
-        info.url = "/" + info.url;
-    }
-    let routerMap = Reflect.getMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, target);
-    if (!routerMap) {
-        routerMap = new Map();
-        Reflect.defineMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, routerMap, target);
-    }
-    let curr = routerMap.get(info.url);
-    if (!curr) {
-        routerMap.set(info.url, info);
-    }
-    else {
-        if (info.url != curr.url) {
-            console.warn(`The two URL names are inconsisten in (${info.url},${curr.url})`);
-        }
-        curr.request = [...info.request, ...curr.request];
-    }
-}
-exports.default = AddMapping;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = AddMapping;
+require("reflect-metadata");
+const DesignMeta_1 = require("../../type/DesignMeta");
+function AddMapping(target, info) {
+    if (!info.url) {
+        info.url = info.method;
+    }
+    //格式化url 以/开头
+    if (!info.url.startsWith("/")) {
+        info.url = "/" + info.url;
+    }
+    let routerMap = Reflect.getMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, target);
+    if (!routerMap) {
+        routerMap = new Map();
+        Reflect.defineMetadata(DesignMeta_1.DesignMeta.ROUTER_MAP, routerMap, target);
+    }
+    let curr = routerMap.get(info.url);
+    if (!curr) {
+        routerMap.set(info.url, info);
+    }
+    else {
+        if (info.url != curr.url) {
+            console.warn(`The two URL names are inconsisten in (${info.url},${curr.url})`);
+        }
+        curr.request = [...info.request, ...curr.request];
+    }
+}

package/target/annotation/router/AllMapping.js

@@ -1,14 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const RouteMethods_1 = require("../../type/RouteMethods");
-const AddMapping_1 = require("./AddMapping");
-function AllMapping(url) {
-    return function (target, name, descriptor) {
-        (0, AddMapping_1.default)(target, {
-            url,
-            method: name,
-            request: [RouteMethods_1.RouteMethods.AllMapping],
-        });
-    };
-}
-exports.default = AllMapping;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = AllMapping;
+const RouteMethods_1 = require("../../type/RouteMethods");
+const AddMapping_1 = require("./AddMapping");
+function AllMapping(url) {
+    return function (target, name, descriptor) {
+        (0, AddMapping_1.default)(target, {
+            url,
+            method: name,
+            request: [RouteMethods_1.RouteMethods.AllMapping],
+        });
+    };
+}