@eggjs/tegg-aop-plugin 3.14.1 → 3.14.3

package/app.d.ts

@@ -4,7 +4,9 @@ export default class AopAppHook {
     private readonly loadUnitAopHook;
     private readonly eggPrototypeCrossCutHook;
     private readonly eggObjectAopHook;
+    private aopContextHook;
     constructor(app: any);
     configDidLoad(): void;
+    didLoad(): Promise<void>;
     beforeClose(): void;
 }

package/app.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const aop_1 = require("@eggjs/tegg/aop");
 const tegg_aop_runtime_1 = require("@eggjs/tegg-aop-runtime");
+const AopContextHook_1 = require("./lib/AopContextHook");
 class AopAppHook {
     constructor(app) {
         this.app = app;
@@ -15,11 +16,17 @@ class AopAppHook {
         this.app.loadUnitLifecycleUtil.registerLifecycle(this.loadUnitAopHook);
         this.app.eggObjectLifecycleUtil.registerLifecycle(this.eggObjectAopHook);
     }
+    async didLoad() {
+        await this.app.moduleHandler.ready();
+        this.aopContextHook = new AopContextHook_1.AopContextHook(this.app.moduleHandler);
+        this.app.eggContextLifecycleUtil.registerLifecycle(this.aopContextHook);
+    }
     beforeClose() {
         this.app.eggPrototypeLifecycleUtil.deleteLifecycle(this.eggPrototypeCrossCutHook);
         this.app.loadUnitLifecycleUtil.deleteLifecycle(this.loadUnitAopHook);
         this.app.eggObjectLifecycleUtil.deleteLifecycle(this.eggObjectAopHook);
+        this.app.eggContextLifecycleUtil.deleteLifecycle(this.aopContextHook);
     }
 }
 exports.default = AopAppHook;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EseUNBQXdEO0FBQ3hELDhEQUFzRztBQUV0RyxNQUFxQixVQUFVO0lBUTdCLFlBQVksR0FBRztRQUNiLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLHFCQUFxQixHQUFHLElBQUksMkJBQXFCLEVBQUUsQ0FBQztRQUN6RCxJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksa0NBQWUsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN2RSxJQUFJLENBQUMsd0JBQXdCLEdBQUcsSUFBSSwyQ0FBd0IsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN6RixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxtQ0FBZ0IsRUFBRSxDQUFDO0lBQ2pELENBQUM7SUFFRCxhQUFhO1FBQ1gsSUFBSSxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUNwRixJQUFJLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN2RSxJQUFJLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxXQUFXO1FBQ1QsSUFBSSxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDbEYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3JFLElBQUksQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7Q0FDRjtBQTNCRCw2QkEyQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EseUNBQXdEO0FBQ3hELDhEQUFzRztBQUN0Ryx5REFBc0Q7QUFFdEQsTUFBcUIsVUFBVTtJQVM3QixZQUFZLEdBQUc7UUFDYixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxxQkFBcUIsR0FBRyxJQUFJLDJCQUFxQixFQUFFLENBQUM7UUFDekQsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLGtDQUFlLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLHdCQUF3QixHQUFHLElBQUksMkNBQXdCLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDekYsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksbUNBQWdCLEVBQUUsQ0FBQztJQUNqRCxDQUFDO0lBRUQsYUFBYTtRQUNYLElBQUksQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDcEYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3JDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSwrQkFBYyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUNsRixJQUFJLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDckUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7Q0FDRjtBQW5DRCw2QkFtQ0MifQ==

package/lib/AopContextHook.d.ts

@@ -0,0 +1,17 @@
+import { Application } from 'egg';
+import { EggProtoImplClass, LifecycleHook } from '@eggjs/tegg';
+import { EggContext, EggContextLifecycleContext } from '@eggjs/tegg-runtime';
+import { EggPrototype } from '@eggjs/tegg-metadata';
+export interface EggPrototypeWithClazz extends EggPrototype {
+    clazz?: EggProtoImplClass;
+}
+export interface ProtoToCreate {
+    name: string;
+    proto: EggPrototype;
+}
+export declare class AopContextHook implements LifecycleHook<EggContextLifecycleContext, EggContext> {
+    private readonly moduleHandler;
+    private requestProtoList;
+    constructor(moduleHandler: Application['moduleHandler']);
+    preCreate(_: any, ctx: EggContext): Promise<void>;
+}

package/lib/AopContextHook.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AopContextHook = void 0;
+const tegg_1 = require("@eggjs/tegg");
+const aop_decorator_1 = require("@eggjs/aop-decorator");
+const tegg_metadata_1 = require("@eggjs/tegg-metadata");
+const egg_module_common_1 = require("@eggjs/egg-module-common");
+class AopContextHook {
+    constructor(moduleHandler) {
+        this.requestProtoList = [];
+        this.moduleHandler = moduleHandler;
+        for (const loadUnitInstance of this.moduleHandler.loadUnitInstances) {
+            const iterator = loadUnitInstance.loadUnit.iterateEggPrototype();
+            for (const proto of iterator) {
+                const protoWithClazz = proto;
+                const clazz = protoWithClazz.clazz;
+                if (!clazz)
+                    continue;
+                const aspects = aop_decorator_1.AspectInfoUtil.getAspectList(clazz);
+                for (const aspect of aspects) {
+                    for (const advice of aspect.adviceList) {
+                        const adviceProto = tegg_1.PrototypeUtil.getClazzProto(advice.clazz);
+                        if (!adviceProto) {
+                            throw tegg_metadata_1.TeggError.create(`Aop Advice(${advice.clazz.name}) not found in loadUnits`, 'advice_not_found');
+                        }
+                        if (adviceProto.initType === tegg_1.ObjectInitType.CONTEXT) {
+                            this.requestProtoList.push({
+                                name: advice.name,
+                                proto: adviceProto,
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    }
+    async preCreate(_, ctx) {
+        // compatible with egg controller
+        // add context aspect to ctx
+        if (!ctx.get(egg_module_common_1.ROOT_PROTO)) {
+            for (const proto of this.requestProtoList) {
+                ctx.addProtoToCreate(proto.name, proto.proto);
+            }
+        }
+    }
+}
+exports.AopContextHook = AopContextHook;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQW9wQ29udGV4dEhvb2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJBb3BDb250ZXh0SG9vay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxzQ0FBOEY7QUFFOUYsd0RBQXNEO0FBQ3RELHdEQUErRDtBQUMvRCxnRUFBc0Q7QUFXdEQsTUFBYSxjQUFjO0lBSXpCLFlBQVksYUFBMkM7UUFGL0MscUJBQWdCLEdBQXlCLEVBQUUsQ0FBQztRQUdsRCxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxLQUFLLE1BQU0sZ0JBQWdCLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxpQkFBaUIsRUFBRTtZQUNuRSxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUNqRSxLQUFLLE1BQU0sS0FBSyxJQUFJLFFBQVEsRUFBRTtnQkFDNUIsTUFBTSxjQUFjLEdBQUcsS0FBOEIsQ0FBQztnQkFDdEQsTUFBTSxLQUFLLEdBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQztnQkFDbkMsSUFBSSxDQUFDLEtBQUs7b0JBQUUsU0FBUztnQkFDckIsTUFBTSxPQUFPLEdBQUcsOEJBQWMsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3BELEtBQUssTUFBTSxNQUFNLElBQUksT0FBTyxFQUFFO29CQUM1QixLQUFLLE1BQU0sTUFBTSxJQUFJLE1BQU0sQ0FBQyxVQUFVLEVBQUU7d0JBQ3RDLE1BQU0sV0FBVyxHQUFHLG9CQUFhLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQTZCLENBQUM7d0JBQzFGLElBQUksQ0FBQyxXQUFXLEVBQUU7NEJBQ2hCLE1BQU0seUJBQVMsQ0FBQyxNQUFNLENBQUMsY0FBYyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksMEJBQTBCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQzt5QkFDdkc7d0JBQ0QsSUFBSSxXQUFXLENBQUMsUUFBUSxLQUFLLHFCQUFjLENBQUMsT0FBTyxFQUFFOzRCQUNuRCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO2dDQUN6QixJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUk7Z0NBQ2pCLEtBQUssRUFBRSxXQUFXOzZCQUNuQixDQUFDLENBQUM7eUJBQ0o7cUJBQ0Y7aUJBQ0Y7YUFDRjtTQUNGO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEdBQWU7UUFDaEMsaUNBQWlDO1FBQ2pDLDRCQUE0QjtRQUM1QixJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyw4QkFBVSxDQUFDLEVBQUU7WUFDeEIsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUU7Z0JBQ3pDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQzthQUMvQztTQUNGO0lBQ0gsQ0FBQztDQUNGO0FBeENELHdDQXdDQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/tegg-aop-plugin",
-  "version": "3.14.1",
+  "version": "3.14.3",
   "eggPlugin": {
     "name": "aopModule",
     "dependencies": [
@@ -18,7 +18,9 @@
   ],
   "files": [
     "app.js",
-    "app.d.ts"
+    "app.d.ts",
+    "lib/**/*.js",
+    "lib/**/*.d.ts"
   ],
   "scripts": {
     "test": "cross-env NODE_ENV=test NODE_OPTIONS='--no-deprecation' mocha",
@@ -40,12 +42,12 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@eggjs/tegg": "^3.14.1",
-    "@eggjs/tegg-aop-runtime": "^3.14.1"
+    "@eggjs/tegg": "^3.14.3",
+    "@eggjs/tegg-aop-runtime": "^3.14.3"
   },
   "devDependencies": {
-    "@eggjs/tegg-config": "^3.14.1",
-    "@eggjs/tegg-plugin": "^3.14.1",
+    "@eggjs/tegg-config": "^3.14.3",
+    "@eggjs/tegg-plugin": "^3.14.3",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.2.4",
     "cross-env": "^7.0.3",
@@ -58,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "40d6627b827130ce3c963b05499ef8c9fd4ccbcb"
+  "gitHead": "467cbb2ff77708529b7402510bd69da71d206264"
 }