@midwayjs/leoric 3.13.7 → 3.13.9

package/dist/configuration.js

@@ -20,10 +20,28 @@ function getModelName(model) {
 }
 let LeoricConfiguration = class LeoricConfiguration {
     async init() {
-        this.decoratorService.registerPropertyHandler(decorator_1.MODEL_KEY, (propertyName, meta) => {
-            return this.dataSourceManager.getDataSource(meta.connectionName ||
+        this.decoratorService.registerPropertyHandler(decorator_1.MODEL_KEY, (propertyName, meta, instance) => {
+            const dataSource = this.dataSourceManager.getDataSource(meta.connectionName ||
                 this.dataSourceManager.getDataSourceNameByModel(meta.modelName) ||
-                this.dataSourceManager.getDefaultDataSourceName()).models[getModelName(meta.modelName)];
+                this.dataSourceManager.getDefaultDataSourceName());
+            const model = dataSource.models[getModelName(meta.modelName)];
+            const ctx = instance[core_1.REQUEST_OBJ_CTX_KEY];
+            const app = instance[core_1.APPLICATION_KEY];
+            if (ctx) {
+                return class extends model {
+                    static get ctx() {
+                        return ctx;
+                    }
+                    static get app() {
+                        return ctx.getApp();
+                    }
+                };
+            }
+            return class extends model {
+                static get app() {
+                    return app;
+                }
+            };
         });
         this.decoratorService.registerPropertyHandler(decorator_1.DATA_SOURCE_KEY, (propertyName, meta) => {
             return this.dataSourceManager.getDataSource(meta.dataSourceName ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/leoric",
-  "version": "3.13.7",
+  "version": "3.13.9",
   "description": "Leoric as a Midway model component",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -22,7 +22,8 @@
   },
   "devDependencies": {
     "@midwayjs/core": "^3.13.7",
-    "@midwayjs/mock": "^3.13.7",
+    "@midwayjs/koa": "^3.13.9",
+    "@midwayjs/mock": "^3.13.9",
     "sqlite3": "5.1.6"
   },
   "scripts": {
@@ -35,5 +36,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "8a239c69f8a711a5e71fae63148bc5f3daf95828"
+  "gitHead": "00750219506f4e3ad0e1dbb167d295610005b328"
 }