@midwayjs/core 3.3.0 → 3.3.4

package/dist/baseFramework.js

@@ -272,7 +272,7 @@ class BaseFramework {
         return this.informationService.getProjectName();
     }
     getFrameworkName() {
-        return '';
+        return this.constructor.name;
     }
     useMiddleware(middleware) {
         this.middlewareManager.insertLast(middleware);

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,12 +49,32 @@ 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);
         debug(`[core]: Found Framework length = ${frameworks.length}`);
         if (frameworks.length) {
             for (const frameworkClz of frameworks) {
+                if (!this.applicationContext.hasDefinition((0, decorator_1.getProviderUUId)(frameworkClz))) {
+                    debug(`[core]: Found Framework "${frameworkClz.name}" but missing definition, skip initialize.`);
+                    continue;
+                }
                 const frameworkInstance = await this.applicationContext.getAsync(frameworkClz, [this.applicationContext]);
                 // if enable, just init framework
                 if (frameworkInstance.isEnable()) {
@@ -73,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.0",
+  "version": "3.3.4",
   "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": "b12b41188879296f9863265baa5bbdb4158bddc5"
+  "gitHead": "0c2785a87217f57a184a661c71b1d9562af02242"
 }