@meadmin/core 1.2.3 → 1.3.1

package/bin/devBootstrap.js

@@ -1,8 +1,8 @@
-#!/usr/bin/env node
-import { run } from 'mwtsc';
-import { check } from 'mwtsc/lib/version/check.js';
-import { rmSync } from 'node:fs';
-import { resolve } from 'node:path';
-const tempCache = resolve(process.cwd(), 'node_modules/.meadmin/temp/');
-rmSync(tempCache, { force: true, recursive: true });
-check(run);
+#!/usr/bin/env node
+import { run } from 'mwtsc';
+import { check } from 'mwtsc/lib/version/check.js';
+import { rmSync } from 'node:fs';
+import { resolve } from 'node:path';
+const tempCache = resolve(process.cwd(), 'node_modules/.meadmin/temp/');
+rmSync(tempCache, { force: true, recursive: true });
+check(run);

package/bin/watchBootstrap.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawn } from 'child_process';
-// eslint-disable-next-line node/no-unpublished-import
+ 
 import { run } from 'mwtsc';
 import { check } from 'mwtsc/lib/version/check.js';
 check(() => {

package/dist/middleware/globale.middleware.js

@@ -22,9 +22,6 @@ let GlobaleMiddleware = class GlobaleMiddleware {
                 try {
                     await next();
                 }
-                catch (e) {
-                    throw e;
-                }
                 finally {
                     removeAsyncGlobal(undefined, id);
                 }
@@ -36,4 +33,4 @@ GlobaleMiddleware = __decorate([
     Middleware()
 ], GlobaleMiddleware);
 export { GlobaleMiddleware };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsZS5taWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21pZGRsZXdhcmUvZ2xvYmFsZS5taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxpQkFBaUIsRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvRixPQUFPLEVBQWUsVUFBVSxFQUFnQixNQUFNLGdCQUFnQixDQUFDO0FBRXZFLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQztBQUVkLFVBQVU7QUFFSCxJQUFNLGlCQUFpQixHQUF2QixNQUFNLGlCQUFpQjtJQUM1QixPQUFPO1FBQ0wsT0FBTyxLQUFLLEVBQUUsR0FBWSxFQUFFLElBQWtCLEVBQUUsRUFBRTtZQUNoRCxJQUFJLEVBQUUsR0FBRyxVQUFVLEdBQUcsS0FBSyxDQUFDO1lBQzVCLE1BQU0sdUJBQXVCLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxLQUFLLElBQUksRUFBRTtnQkFDL0MsSUFBSSxLQUFLLEtBQUssTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUM7b0JBQ3RDLHNEQUFzRDtvQkFDdEQsS0FBSyxHQUFHLENBQUMsQ0FBQztnQkFDWixDQUFDO2dCQUNELEVBQUUsR0FBRyxVQUFVLEdBQUcsS0FBSyxFQUFFLENBQUM7Z0JBQzFCLGVBQWUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7Z0JBQzVCLElBQUksQ0FBQztvQkFDSCxNQUFNLElBQUksRUFBRSxDQUFDO2dCQUNmLENBQUM7Z0JBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztvQkFDWCxNQUFNLENBQUMsQ0FBQztnQkFDVixDQUFDO3dCQUFTLENBQUM7b0JBQ1QsaUJBQWlCLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUNuQyxDQUFDO1lBQ0gsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0YsQ0FBQTtBQXJCWSxpQkFBaUI7SUFEN0IsVUFBVSxFQUFFO0dBQ0EsaUJBQWlCLENBcUI3QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsZS5taWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21pZGRsZXdhcmUvZ2xvYmFsZS5taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxpQkFBaUIsRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFNUMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0FBRWQsVUFBVTtBQUVILElBQU0saUJBQWlCLEdBQXZCLE1BQU0saUJBQWlCO0lBQzVCLE9BQU87UUFDTCxPQUFPLEtBQUssRUFBRSxHQUFZLEVBQUUsSUFBa0IsRUFBRSxFQUFFO1lBQ2hELElBQUksRUFBRSxHQUFHLFVBQVUsR0FBRyxLQUFLLENBQUM7WUFDNUIsTUFBTSx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFO2dCQUMvQyxJQUFJLEtBQUssS0FBSyxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztvQkFDdEMsc0RBQXNEO29CQUN0RCxLQUFLLEdBQUcsQ0FBQyxDQUFDO2dCQUNaLENBQUM7Z0JBQ0QsRUFBRSxHQUFHLFVBQVUsR0FBRyxLQUFLLEVBQUUsQ0FBQztnQkFDMUIsZUFBZSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxDQUFDO29CQUNILE1BQU0sSUFBSSxFQUFFLENBQUM7Z0JBQ2YsQ0FBQzt3QkFBUyxDQUFDO29CQUNULGlCQUFpQixDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDbkMsQ0FBQztZQUNILENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGLENBQUE7QUFuQlksaUJBQWlCO0lBRDdCLFVBQVUsRUFBRTtHQUNBLGlCQUFpQixDQW1CN0IifQ==

package/dist/service/router.service.d.ts

@@ -5,6 +5,6 @@
 import { ControllerOption } from '@midwayjs/core';
 export declare class RouterService {
     protected routerOptionsMerged: Map<ControllerOption, boolean>;
-    protected mergeControllerOption(controllerOption: ControllerOption, controllerClz: Record<string, unknown>): any;
+    protected mergeControllerOption(controllerOption: ControllerOption, controllerClz: Record<string, unknown>): ControllerOption;
     initControllerOption(): void;
 }

package/dist/service/router.service.js

@@ -4,10 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
-/**
- * 根据 controller 继承关系 递归合成Controller装饰器的path
- * 从第一个prefix以/开头的祖级开始合并controller的prefix和routerOptions，如果prefix 以/开头，则不合并prefix和routerOptions。
- */
 import { CONTROLLER_KEY, getClassMetadata, listModule, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { merge } from '../util/index.js';
 let RouterService = class RouterService {
@@ -43,4 +39,4 @@ RouterService = __decorate([
     Scope(ScopeEnum.Singleton)
 ], RouterService);
 export { RouterService };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZS9yb3V0ZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQTs7O0dBR0c7QUFDSCxPQUFPLEVBQUUsY0FBYyxFQUFvQixnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMzSCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJbEMsSUFBTSxhQUFhLEdBQW5CLE1BQU0sYUFBYTtJQUNkLG1CQUFtQixHQUFHLElBQUksR0FBRyxFQUE2QixDQUFDO0lBRXJFLDRCQUE0QjtJQUNsQixxQkFBcUIsQ0FBQyxnQkFBa0MsRUFBRSxhQUFzQztRQUN4RyxJQUFJLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUM1RCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQ3ZELE1BQU0sWUFBWSxHQUFHLGdCQUFnQixDQUFDLGNBQWMsRUFBRSxTQUFTLENBQUMsQ0FBQztZQUNqRSxJQUFJLFlBQVksRUFBRSxDQUFDO2dCQUNqQixJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO29CQUM3QyxnQkFBZ0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLENBQUMsTUFBTSxHQUFHLEdBQUcsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO29CQUN0RyxJQUFJLGdCQUFnQixDQUFDLGFBQWEsSUFBSSxZQUFZLENBQUMsYUFBYSxFQUFFLENBQUM7d0JBQ2pFLGdCQUFnQixDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztvQkFDckcsQ0FBQztnQkFDSCxDQUFDO2dCQUNELE9BQU8sSUFBSSxDQUFDLHFCQUFxQixDQUFDLGdCQUFnQixFQUFFLFNBQVMsQ0FBQyxDQUFDO1lBQ2pFLENBQUM7WUFDRCxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLGdCQUFnQixFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3ZELENBQUM7UUFDRCxPQUFPLGdCQUFnQixDQUFDO0lBQzFCLENBQUM7SUFFRCxzQkFBc0I7SUFDZixvQkFBb0I7UUFDekIsTUFBTSxpQkFBaUIsR0FBRyxVQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDckQsS0FBSyxNQUFNLE1BQU0sSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1lBQ3ZDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDL0UsQ0FBQztJQUNILENBQUM7Q0FDRixDQUFBO0FBN0JZLGFBQWE7SUFGekIsT0FBTyxFQUFFO0lBQ1QsS0FBSyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7R0FDZCxhQUFhLENBNkJ6QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZS9yb3V0ZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFLQSxPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3pHLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUlsQyxJQUFNLGFBQWEsR0FBbkIsTUFBTSxhQUFhO0lBQ2QsbUJBQW1CLEdBQUcsSUFBSSxHQUFHLEVBQTZCLENBQUM7SUFFckUsNEJBQTRCO0lBQ2xCLHFCQUFxQixDQUFDLGdCQUFrQyxFQUFFLGFBQXNDO1FBQ3hHLElBQUksSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1lBQzVELE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUM7WUFDdkQsTUFBTSxZQUFZLEdBQUcsZ0JBQWdCLENBQUMsY0FBYyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1lBQ2pFLElBQUksWUFBWSxFQUFFLENBQUM7Z0JBQ2pCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7b0JBQzdDLGdCQUFnQixDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksQ0FBQyxNQUFNLEdBQUcsR0FBRyxHQUFHLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQ3RHLElBQUksZ0JBQWdCLENBQUMsYUFBYSxJQUFJLFlBQVksQ0FBQyxhQUFhLEVBQUUsQ0FBQzt3QkFDakUsZ0JBQWdCLENBQUMsYUFBYSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxDQUFDO29CQUNyRyxDQUFDO2dCQUNILENBQUM7Z0JBQ0QsT0FBTyxJQUFJLENBQUMscUJBQXFCLENBQUMsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUNELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdkQsQ0FBQztRQUNELE9BQU8sZ0JBQWdCLENBQUM7SUFDMUIsQ0FBQztJQUVELHNCQUFzQjtJQUNmLG9CQUFvQjtRQUN6QixNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUNyRCxLQUFLLE1BQU0sTUFBTSxJQUFJLGlCQUFpQixFQUFFLENBQUM7WUFDdkMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLGdCQUFnQixDQUFDLGNBQWMsRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUMvRSxDQUFDO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUE3QlksYUFBYTtJQUZ6QixPQUFPLEVBQUU7SUFDVCxLQUFLLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQztHQUNkLGFBQWEsQ0E2QnpCIn0=

package/index.d.ts

@@ -1,2 +1,2 @@
-export * from './dist/index.d.ts';
-export * from './dist/index.js';
+export * from './dist/index.d.ts';
+export * from './dist/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meadmin/core",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -27,7 +27,6 @@
     "tsx": "^4.20.5"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^3.20.11",
     "@types/mocha": "^10.0.10",
     "@types/node": "^16.18.126",
     "c8": "^8.0.1",