@midwayjs/core 3.3.1 → 3.3.5

package/dist/error/framework.d.ts

@@ -15,6 +15,7 @@ export declare const FrameworkErrorEnum: {
     readonly MISSING_IMPORTS: "MIDWAY_10011";
     readonly UTIL_HTTP_TIMEOUT: "MIDWAY_10012";
     readonly INCONSISTENT_VERSION: "MIDWAY_10013";
+    readonly INVALID_CONFIG: "MIDWAY_10014";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -37,6 +38,9 @@ export declare class MidwayFeatureNotImplementedError extends MidwayError {
 export declare class MidwayConfigMissingError extends MidwayError {
     constructor(configKey: string);
 }
+export declare class MidwayInvalidConfigError extends MidwayError {
+    constructor(message?: string);
+}
 export declare class MidwayResolverMissingError extends MidwayError {
     constructor(type: string);
 }

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
+exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayInvalidConfigError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
 exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UNKNOWN: 10000,
@@ -17,6 +17,7 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     MISSING_IMPORTS: 10011,
     UTIL_HTTP_TIMEOUT: 10012,
     INCONSISTENT_VERSION: 10013,
+    INVALID_CONFIG: 10014,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -67,6 +68,12 @@ class MidwayConfigMissingError extends base_1.MidwayError {
     }
 }
 exports.MidwayConfigMissingError = MidwayConfigMissingError;
+class MidwayInvalidConfigError extends base_1.MidwayError {
+    constructor(message) {
+        super('Invalid config file \n' + message, exports.FrameworkErrorEnum.INVALID_CONFIG);
+    }
+}
+exports.MidwayInvalidConfigError = MidwayInvalidConfigError;
 class MidwayResolverMissingError extends base_1.MidwayError {
     constructor(type) {
         super(`${type} resolver is not exists!`, exports.FrameworkErrorEnum.MISSING_RESOLVER);

package/dist/service/configService.js

@@ -18,6 +18,7 @@ const util = require("util");
 const environmentService_1 = require("./environmentService");
 const informationService_1 = require("./informationService");
 const extend_1 = require("../util/extend");
+const error_1 = require("../error");
 const debug = util.debuglog('midway:debug');
 let MidwayConfigService = class MidwayConfigService {
     constructor() {
@@ -174,8 +175,11 @@ let MidwayConfigService = class MidwayConfigService {
         let exports = typeof configFilename === 'string'
             ? require(configFilename)
             : configFilename;
-        if (exports && exports['default'] && Object.keys(exports).length === 1) {
-            exports = exports['default'];
+        if (exports && exports.default) {
+            if (Object.keys(exports).length > 1) {
+                throw new error_1.MidwayInvalidConfigError(`${configFilename} should not have both a default export and named export`);
+            }
+            exports = exports.default;
         }
         return exports;
     }

package/dist/service/frameworkService.js

@@ -29,7 +29,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         this.globalFrameworkList = [];
     }
     async init() {
-        var _a;
+        var _a, _b;
         // register base config hook
         this.decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
             var _a;
@@ -49,6 +49,22 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             var _a, _b;
             return new pipelineService_1.MidwayPipelineService((_b = (_a = instance[interface_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a.requestContext) !== null && _b !== void 0 ? _b : this.applicationContext, meta.valves);
         });
+        // register @App decorator handler
+        this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
+            if (mete.type) {
+                const framework = this.applicationManager.getApplication(mete.type);
+                if (!framework) {
+                    throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
+                }
+                return framework;
+            }
+            else {
+                return this.getMainApp();
+            }
+        });
+        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
+            return this.getMainApp()[key];
+        });
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto
         frameworks = filterProtoFramework(frameworks);
@@ -77,24 +93,13 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 this.applicationManager.addFramework((_a = definition === null || definition === void 0 ? void 0 : definition.namespace) !== null && _a !== void 0 ? _a : frameworkInstance.getFrameworkName(), frameworkInstance);
                 this.globalFrameworkList.push(frameworkInstance);
             }
-            // register @App decorator handler
-            this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
-                if (mete.type) {
-                    const framework = this.applicationManager.getApplication(mete.type);
-                    if (!framework) {
-                        throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
-                    }
-                    return framework;
-                }
-                else {
-                    return this.getMainApp();
-                }
-            });
-            this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
-                return this.getMainApp()[key];
-            });
+            const nsSet = this.applicationContext['namespaceSet'];
+            let mainNs;
+            if (nsSet.size > 0) {
+                [mainNs] = nsSet;
+            }
             global['MIDWAY_MAIN_FRAMEWORK'] = this.mainFramework =
-                this.globalFrameworkList[0];
+                (_b = this.applicationManager.getFramework(mainNs)) !== null && _b !== void 0 ? _b : this.globalFrameworkList[0];
         }
         // init aspect module
         await this.aspectService.loadAspect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.3.1",
+  "version": "3.3.5",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,12 +21,12 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.1.6",
+    "@midwayjs/decorator": "^3.3.4",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
     "raw-body": "2.5.1",
-    "sinon": "13.0.1"
+    "sinon": "13.0.2"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "f603b622b205ec126de628eeab59f90045a75dd2"
+  "gitHead": "5a835008aaa26e1b3c7d99c525f4a9fdaa3e41d1"
 }