@eggjs/tegg-aop-runtime 3.1.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/tegg-aop-runtime",
-  "version": "3.1.0",
+  "version": "3.2.2",
   "description": "tegg aop",
   "main": "dist/index.js",
   "eggModule": {
@@ -19,11 +19,11 @@
     "aop"
   ],
   "scripts": {
-    "clean": "tsc -b --clean",
+    "test": "cross-env NODE_ENV=test NODE_OPTIONS='--no-deprecation' mocha",
+    "clean": "tsc -b --clean && rm -rf dist",
     "tsc": "npm run clean && tsc -p ./tsconfig.json",
     "tsc:pub": "npm run clean && tsc -p ./tsconfig.pub.json",
-    "prepublishOnly": "npm run tsc:pub",
-    "autod": "autod"
+    "prepublishOnly": "npm run tsc:pub"
   },
   "author": "killagu <killa123@126.com>",
   "license": "MIT",
@@ -43,17 +43,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@eggjs/aop-decorator": "^3.1.0",
-    "@eggjs/core-decorator": "^3.1.0",
-    "@eggjs/tegg-common-util": "^1.2.3",
-    "@eggjs/tegg-lifecycle": "^1.0.0",
-    "@eggjs/tegg-metadata": "^3.1.0",
-    "@eggjs/tegg-runtime": "^3.1.0",
+    "@eggjs/aop-decorator": "^3.2.2",
+    "@eggjs/core-decorator": "^3.2.2",
+    "@eggjs/tegg-common-util": "^3.2.2",
+    "@eggjs/tegg-lifecycle": "^3.2.2",
+    "@eggjs/tegg-metadata": "^3.2.2",
+    "@eggjs/tegg-runtime": "^3.2.2",
     "koa-compose": "^4.1.0"
   },
   "devDependencies": {
-    "@eggjs/module-test-util": "^3.1.0",
-    "@eggjs/tegg-loader": "^3.1.0"
+    "@eggjs/module-test-util": "^3.2.2",
+    "@eggjs/tegg-loader": "^3.2.2",
+    "mm": "^3.2.1"
   },
-  "gitHead": "19ff0ca1dc6286fc54445c30ccff64b582c59fd0"
+  "gitHead": "1db4e5320a0ea19b450df7d99ab7939f3ad48f6e"
 }

package/dist/aop-runtime/index.d.ts

@@ -1,3 +0,0 @@
-export * from './src/EggPrototypeCrossCutHook';
-export * from './src/EggObjectAopHook';
-export * from './src/LoadUnitAopHook';

package/dist/aop-runtime/index.js

@@ -1,20 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/EggPrototypeCrossCutHook"), exports);
-__exportStar(require("./src/EggObjectAopHook"), exports);
-__exportStar(require("./src/LoadUnitAopHook"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsaUVBQStDO0FBQy9DLHlEQUF1QztBQUN2Qyx3REFBc0MifQ==

package/dist/aop-runtime/src/AspectExecutor.d.ts

@@ -1,13 +0,0 @@
-import { AdviceContext, AspectAdvice } from '@eggjs/aop-decorator';
-export declare class AspectExecutor {
-    obj: Object;
-    method: PropertyKey;
-    aspectAdviceList: readonly AspectAdvice[];
-    constructor(obj: object, method: PropertyKey, aspectAdviceList: readonly AspectAdvice[]);
-    execute(...args: any[]): Promise<void>;
-    beforeCall(ctx: AdviceContext): Promise<void>;
-    afterReturn(ctx: AdviceContext, result: any): Promise<void>;
-    afterThrow(ctx: AdviceContext, error: Error): Promise<void>;
-    afterFinally(ctx: AdviceContext): Promise<void>;
-    doExecute(ctx: AdviceContext): Promise<void>;
-}

package/dist/aop-runtime/src/AspectExecutor.js

@@ -1,84 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AspectExecutor = void 0;
-const koa_compose_1 = __importDefault(require("koa-compose"));
-class AspectExecutor {
-    constructor(obj, method, aspectAdviceList) {
-        this.obj = obj;
-        this.method = method;
-        this.aspectAdviceList = aspectAdviceList;
-    }
-    async execute(...args) {
-        const ctx = {
-            that: this.obj,
-            method: this.method,
-            args,
-        };
-        await this.beforeCall(ctx);
-        try {
-            const result = await this.doExecute(ctx);
-            await this.afterReturn(ctx, result);
-            return result;
-        }
-        catch (e) {
-            await this.afterThrow(ctx, e);
-            throw e;
-        }
-        finally {
-            await this.afterFinally(ctx);
-        }
-    }
-    async beforeCall(ctx) {
-        for (const aspectAdvice of this.aspectAdviceList) {
-            const advice = ctx.that[aspectAdvice.name];
-            if (advice.beforeCall) {
-                await advice.beforeCall(ctx);
-            }
-        }
-    }
-    async afterReturn(ctx, result) {
-        for (const aspectAdvice of this.aspectAdviceList) {
-            const advice = ctx.that[aspectAdvice.name];
-            if (advice.afterReturn) {
-                await advice.afterReturn(ctx, result);
-            }
-        }
-    }
-    async afterThrow(ctx, error) {
-        for (const aspectAdvice of this.aspectAdviceList) {
-            const advice = ctx.that[aspectAdvice.name];
-            if (advice.afterThrow) {
-                await advice.afterThrow(ctx, error);
-            }
-        }
-    }
-    async afterFinally(ctx) {
-        for (const aspectAdvice of this.aspectAdviceList) {
-            const advice = ctx.that[aspectAdvice.name];
-            if (advice.afterFinally) {
-                await advice.afterFinally(ctx);
-            }
-        }
-    }
-    async doExecute(ctx) {
-        const lastCall = () => {
-            const originMethod = Object.getPrototypeOf(this.obj)[this.method];
-            return Reflect.apply(originMethod, ctx.that, ctx.args);
-        };
-        const functions = [];
-        for (const aspectAdvice of this.aspectAdviceList) {
-            const advice = ctx.that[aspectAdvice.name];
-            const fn = advice.around;
-            if (fn) {
-                functions.push(fn.bind(advice));
-            }
-        }
-        functions.push(lastCall);
-        return (0, koa_compose_1.default)(functions)(ctx);
-    }
-}
-exports.AspectExecutor = AspectExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXNwZWN0RXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXNwZWN0RXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsOERBQWtDO0FBR2xDLE1BQWEsY0FBYztJQUt6QixZQUFZLEdBQVcsRUFBRSxNQUFtQixFQUFFLGdCQUF5QztRQUNyRixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQztJQUMzQyxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLElBQVc7UUFDMUIsTUFBTSxHQUFHLEdBQWtCO1lBQ3pCLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRztZQUNkLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixJQUFJO1NBQ0wsQ0FBQztRQUNGLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMzQixJQUFJO1lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3pDLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDcEMsT0FBTyxNQUFNLENBQUM7U0FDZjtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUM5QixNQUFNLENBQUMsQ0FBQztTQUNUO2dCQUFTO1lBQ1IsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzlCO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBa0I7UUFDakMsS0FBSyxNQUFNLFlBQVksSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVB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

package/dist/aop-runtime/src/EggObjectAopHook.d.ts

@@ -1,6 +0,0 @@
-import { LifecycleHook } from '@eggjs/tegg-lifecycle';
-import { EggObject, EggObjectLifeCycleContext } from '@eggjs/tegg-runtime';
-export declare class EggObjectAopHook implements LifecycleHook<EggObjectLifeCycleContext, EggObject> {
-    private hijackMethods;
-    postCreate(_: EggObjectLifeCycleContext, eggObject: EggObject): Promise<void>;
-}

package/dist/aop-runtime/src/EggObjectAopHook.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EggObjectAopHook = void 0;
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-const AspectExecutor_1 = require("./AspectExecutor");
-class EggObjectAopHook {
-    hijackMethods(obj, aspectList) {
-        for (const aspect of aspectList) {
-            const newExecutor = new AspectExecutor_1.AspectExecutor(obj, aspect.method, aspect.adviceList);
-            obj[aspect.method] = newExecutor.execute.bind(newExecutor);
-        }
-    }
-    async postCreate(_, eggObject) {
-        const aspectList = eggObject.proto.getMetaData(aop_decorator_1.ASPECT_LIST);
-        if (!aspectList || !aspectList.length)
-            return;
-        const propertyDesc = eggObject.constructor && Reflect.getOwnPropertyDescriptor(eggObject.constructor.prototype, 'obj');
-        // process the lazy getter
-        if (propertyDesc === null || propertyDesc === void 0 ? void 0 : propertyDesc.get) {
-            let obj;
-            const self = this;
-            Object.defineProperty(eggObject, 'obj', {
-                ...propertyDesc,
-                get() {
-                    if (!obj) {
-                        obj = Reflect.apply(propertyDesc.get, eggObject, []);
-                        self.hijackMethods(obj, aspectList);
-                    }
-                    return obj;
-                },
-            });
-        }
-        else {
-            this.hijackMethods(eggObject.obj, aspectList);
-        }
-    }
-}
-exports.EggObjectAopHook = EggObjectAopHook;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnT2JqZWN0QW9wSG9vay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9FZ2dPYmplY3RBb3BIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHdEQUEyRDtBQUMzRCxxREFBa0Q7QUFFbEQsTUFBYSxnQkFBZ0I7SUFDbkIsYUFBYSxDQUFDLEdBQVEsRUFBRSxVQUF5QjtRQUN2RCxLQUFLLE1BQU0sTUFBTSxJQUFJLFVBQVUsRUFBRTtZQUMvQixNQUFNLFdBQVcsR0FBRyxJQUFJLCtCQUFjLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQzlFLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7U0FDNUQ7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUE0QixFQUFFLFNBQW9CO1FBQ2pFLE1BQU0sVUFBVSxHQUE4QixTQUFTLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQywyQkFBVyxDQUFDLENBQUM7UUFDdkYsSUFBSSxDQUFDLFVBQVUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNO1lBQUUsT0FBTztRQUM5QyxNQUFNLFlBQVksR0FBRyxTQUFTLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUUsQ0FBQztRQUN4SCwwQkFBMEI7UUFDMUIsSUFBSSxZQUFZLGFBQVosWUFBWSx1QkFBWixZQUFZLENBQUUsR0FBRyxFQUFFO1lBQ3JCLElBQUksR0FBRyxDQUFDO1lBQ1IsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDO1lBQ2xCLE1BQU0sQ0FBQyxjQUFjLENBQUMsU0FBUyxFQUFFLEtBQUssRUFBRTtnQkFDdEMsR0FBRyxZQUFZO2dCQUNmLEdBQUc7b0JBQ0QsSUFBSSxDQUFDLEdBQUcsRUFBRTt3QkFDUixHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsR0FBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQzt3QkFDdEQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLENBQUM7cUJBQ3JDO29CQUNELE9BQU8sR0FBRyxDQUFDO2dCQUNiLENBQUM7YUFDRixDQUFDLENBQUM7U0FDSjthQUFNO1lBQ0wsSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1NBQy9DO0lBQ0gsQ0FBQztDQUNGO0FBOUJELDRDQThCQyJ9

package/dist/aop-runtime/src/EggPrototypeCrossCutHook.d.ts

@@ -1,8 +0,0 @@
-import { LifecycleHook } from '@eggjs/tegg-lifecycle';
-import { CrosscutAdviceFactory } from '@eggjs/aop-decorator';
-import { EggPrototype, EggPrototypeLifecycleContext } from '@eggjs/tegg-metadata';
-export declare class EggPrototypeCrossCutHook implements LifecycleHook<EggPrototypeLifecycleContext, EggPrototype> {
-    private readonly crosscutAdviceFactory;
-    constructor(crosscutAdviceFactory: CrosscutAdviceFactory);
-    preCreate(ctx: EggPrototypeLifecycleContext): Promise<void>;
-}

package/dist/aop-runtime/src/EggPrototypeCrossCutHook.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EggPrototypeCrossCutHook = void 0;
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-class EggPrototypeCrossCutHook {
-    constructor(crosscutAdviceFactory) {
-        this.crosscutAdviceFactory = crosscutAdviceFactory;
-    }
-    async preCreate(ctx) {
-        if (aop_decorator_1.CrosscutInfoUtil.isCrosscutAdvice(ctx.clazz)) {
-            this.crosscutAdviceFactory.registerCrossAdviceClazz(ctx.clazz);
-        }
-    }
-}
-exports.EggPrototypeCrossCutHook = EggPrototypeCrossCutHook;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUHJvdG90eXBlQ3Jvc3NDdXRIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0VnZ1Byb3RvdHlwZUNyb3NzQ3V0SG9vay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBK0U7QUFHL0UsTUFBYSx3QkFBd0I7SUFHbkMsWUFBWSxxQkFBNEM7UUFDdEQsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHFCQUFxQixDQUFDO0lBQ3JELENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQWlDO1FBQy9DLElBQUksZ0NBQWdCLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2hELElBQUksQ0FBQyxxQkFBcUIsQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDaEU7SUFDSCxDQUFDO0NBQ0Y7QUFaRCw0REFZQyJ9

package/dist/aop-runtime/src/LoadUnitAopHook.d.ts

@@ -1,12 +0,0 @@
-import { LifecycleHook } from '@eggjs/tegg-lifecycle';
-import { CrosscutAdviceFactory } from '@eggjs/aop-decorator';
-import { EggProtoImplClass } from '@eggjs/core-decorator';
-import { EggPrototype, LoadUnit, LoadUnitLifecycleContext } from '@eggjs/tegg-metadata';
-export interface EggPrototypeWithClazz extends EggPrototype {
-    clazz?: EggProtoImplClass;
-}
-export declare class LoadUnitAopHook implements LifecycleHook<LoadUnitLifecycleContext, LoadUnit> {
-    private readonly crosscutAdviceFactory;
-    constructor(crosscutAdviceFactory: CrosscutAdviceFactory);
-    postCreate(_: LoadUnitLifecycleContext, loadUnit: LoadUnit): Promise<void>;
-}

package/dist/aop-runtime/src/LoadUnitAopHook.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadUnitAopHook = void 0;
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-const core_decorator_1 = require("@eggjs/core-decorator");
-const tegg_metadata_1 = require("@eggjs/tegg-metadata");
-class LoadUnitAopHook {
-    constructor(crosscutAdviceFactory) {
-        this.crosscutAdviceFactory = crosscutAdviceFactory;
-    }
-    async postCreate(_, loadUnit) {
-        for (const proto of loadUnit.iterateEggPrototype()) {
-            const protoWithClazz = proto;
-            const clazz = protoWithClazz.clazz;
-            if (!clazz)
-                continue;
-            const builder = new aop_decorator_1.AspectMetaBuilder(clazz, {
-                crosscutAdviceFactory: this.crosscutAdviceFactory,
-            });
-            const aspectList = builder.build();
-            for (const aspect of aspectList) {
-                aop_decorator_1.AspectInfoUtil.setAspectList(aspectList, clazz);
-                for (const advice of aspect.adviceList) {
-                    const adviceProto = core_decorator_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');
-                    }
-                    proto.injectObjects.push({
-                        refName: advice.name,
-                        objName: advice.name,
-                        qualifiers: [],
-                        proto: adviceProto,
-                    });
-                }
-            }
-        }
-    }
-}
-exports.LoadUnitAopHook = LoadUnitAopHook;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZFVuaXRBb3BIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0xvYWRVbml0QW9wSG9vay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBZ0c7QUFDaEcsMERBQXlFO0FBQ3pFLHdEQUFtRztBQU1uRyxNQUFhLGVBQWU7SUFHMUIsWUFBWSxxQkFBNEM7UUFDdEQsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHFCQUFxQixDQUFDO0lBQ3JELENBQUM7SUFFRCxLQUFLLENBQUMsVUFBVSxDQUFDLENBQTJCLEVBQUUsUUFBa0I7UUFDOUQsS0FBSyxNQUFNLEtBQUssSUFBSSxRQUFRLENBQUMsbUJBQW1CLEVBQUUsRUFBRTtZQUNsRCxNQUFNLGNBQWMsR0FBRyxLQUE4QixDQUFDO1lBQ3RELE1BQU0sS0FBSyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUM7WUFDbkMsSUFBSSxDQUFDLEtBQUs7Z0JBQUUsU0FBUztZQUVyQixNQUFNLE9BQU8sR0FBRyxJQUFJLGlDQUFpQixDQUFDLEtBQUssRUFBRTtnQkFDM0MscUJBQXFCLEVBQUUsSUFBSSxDQUFDLHFCQUFxQjthQUNsRCxDQUFDLENBQUM7WUFDSCxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLE1BQU0sSUFBSSxVQUFVLEVBQUU7Z0JBQy9CLDhCQUFjLENBQUMsYUFBYSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDaEQsS0FBSyxNQUFNLE1BQU0sSUFBSSxNQUFNLENBQUMsVUFBVSxFQUFFO29CQUN0QyxNQUFNLFdBQVcsR0FBRyw4QkFBYSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQzlELElBQUksQ0FBQyxXQUFXLEVBQUU7d0JBQ2hCLE1BQU0seUJBQVMsQ0FBQyxNQUFNLENBQUMsY0FBYyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksMEJBQTBCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztxQkFDdkc7b0JBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUM7d0JBQ3ZCLE9BQU8sRUFBRSxNQUFNLENBQUMsSUFBSTt3QkFDcEIsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJO3dCQUNwQixVQUFVLEVBQUUsRUFBRTt3QkFDZCxLQUFLLEVBQUUsV0FBMkI7cUJBQ25DLENBQUMsQ0FBQztpQkFDSjthQUNGO1NBQ0Y7SUFDSCxDQUFDO0NBQ0Y7QUFuQ0QsMENBbUNDIn0=

package/dist/aop-runtime/test/aop-runtime.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/aop-runtime/test/aop-runtime.test.js

@@ -1,132 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const mm_1 = __importDefault(require("mm"));
-const assert_1 = __importDefault(require("assert"));
-const tegg_runtime_1 = require("@eggjs/tegg-runtime");
-const tegg_metadata_1 = require("@eggjs/tegg-metadata");
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-const test_util_1 = require("../../test-util");
-const Hello_1 = require("./fixtures/modules/hello_succeed/Hello");
-const CoreTestHelper_1 = require("../../test-util/CoreTestHelper");
-const EggObjectAopHook_1 = require("../src/EggObjectAopHook");
-const LoadUnitAopHook_1 = require("../src/LoadUnitAopHook");
-const EggPrototypeCrossCutHook_1 = require("../src/EggPrototypeCrossCutHook");
-describe('test/aop-runtime.test.ts', () => {
-    describe('succeed call', () => {
-        let modules;
-        let crosscutAdviceFactory;
-        let eggObjectAopHook;
-        let loadUnitAopHook;
-        let eggPrototypeCrossCutHook;
-        beforeEach(async () => {
-            crosscutAdviceFactory = new aop_decorator_1.CrosscutAdviceFactory();
-            eggObjectAopHook = new EggObjectAopHook_1.EggObjectAopHook();
-            loadUnitAopHook = new LoadUnitAopHook_1.LoadUnitAopHook(crosscutAdviceFactory);
-            eggPrototypeCrossCutHook = new EggPrototypeCrossCutHook_1.EggPrototypeCrossCutHook(crosscutAdviceFactory);
-            tegg_metadata_1.EggPrototypeLifecycleUtil.registerLifecycle(eggPrototypeCrossCutHook);
-            tegg_metadata_1.LoadUnitLifecycleUtil.registerLifecycle(loadUnitAopHook);
-            tegg_runtime_1.EggObjectLifecycleUtil.registerLifecycle(eggObjectAopHook);
-            modules = await CoreTestHelper_1.CoreTestHelper.prepareModules([
-                path_1.default.join(__dirname, '..'),
-                path_1.default.join(__dirname, 'fixtures/modules/hello_succeed'),
-            ]);
-        });
-        afterEach(async () => {
-            for (const module of modules) {
-                await tegg_metadata_1.LoadUnitFactory.destroyLoadUnit(module.loadUnit);
-                await tegg_runtime_1.LoadUnitInstanceFactory.destroyLoadUnitInstance(module);
-            }
-            tegg_metadata_1.EggPrototypeLifecycleUtil.deleteLifecycle(eggPrototypeCrossCutHook);
-            tegg_metadata_1.LoadUnitLifecycleUtil.deleteLifecycle(loadUnitAopHook);
-            tegg_runtime_1.EggObjectLifecycleUtil.deleteLifecycle(eggObjectAopHook);
-        });
-        it('should work', async () => {
-            await test_util_1.EggTestContext.mockContext(async () => {
-                const hello = await CoreTestHelper_1.CoreTestHelper.getObject(Hello_1.Hello);
-                const callTrace = await CoreTestHelper_1.CoreTestHelper.getObject(Hello_1.CallTrace);
-                const msg = await hello.hello('aop');
-                const traceMsg = callTrace.msgs;
-                (0, assert_1.default)(msg === 'withCrossAroundResult(withPointAroundResult(hello withPointAroundParam(withCrosscutAroundParam(aop))))');
-                assert_1.default.deepStrictEqual(traceMsg, [
-                    {
-                        className: 'CrosscutAdvice',
-                        methodName: 'beforeCall',
-                        id: 233,
-                        name: 'aop',
-                    },
-                    {
-                        className: 'PointcutAdvice',
-                        methodName: 'beforeCall',
-                        id: 233,
-                        name: 'aop',
-                    },
-                    {
-                        className: 'CrosscutAdvice',
-                        methodName: 'afterReturn',
-                        id: 233,
-                        name: 'withPointAroundParam(withCrosscutAroundParam(aop))',
-                        result: 'withCrossAroundResult(withPointAroundResult(hello withPointAroundParam(withCrosscutAroundParam(aop))))',
-                    },
-                    {
-                        className: 'PointcutAdvice',
-                        methodName: 'afterReturn',
-                        id: 233,
-                        name: 'withPointAroundParam(withCrosscutAroundParam(aop))',
-                        result: 'withCrossAroundResult(withPointAroundResult(hello withPointAroundParam(withCrosscutAroundParam(aop))))',
-                    },
-                    {
-                        className: 'CrosscutAdvice',
-                        methodName: 'afterFinally',
-                        id: 233,
-                        name: 'withPointAroundParam(withCrosscutAroundParam(aop))',
-                    },
-                    {
-                        className: 'PointcutAdvice',
-                        methodName: 'afterFinally',
-                        id: 233,
-                        name: 'withPointAroundParam(withCrosscutAroundParam(aop))',
-                    },
-                ]);
-            });
-        });
-        it('mock should work', async () => {
-            await test_util_1.EggTestContext.mockContext(async () => {
-                const hello = await CoreTestHelper_1.CoreTestHelper.getObject(Hello_1.Hello);
-                let helloMocked = false;
-                (0, mm_1.default)(Hello_1.Hello.prototype, 'hello', async () => {
-                    helloMocked = true;
-                });
-                await hello.hello('aop');
-                (0, assert_1.default)(helloMocked === true);
-            });
-        });
-    });
-    describe('should failed', () => {
-        let crosscutAdviceFactory;
-        let eggObjectAopHook;
-        let loadUnitAopHook;
-        let eggPrototypeCrossCutHook;
-        beforeEach(async () => {
-            crosscutAdviceFactory = new aop_decorator_1.CrosscutAdviceFactory();
-            eggObjectAopHook = new EggObjectAopHook_1.EggObjectAopHook();
-            loadUnitAopHook = new LoadUnitAopHook_1.LoadUnitAopHook(crosscutAdviceFactory);
-            eggPrototypeCrossCutHook = new EggPrototypeCrossCutHook_1.EggPrototypeCrossCutHook(crosscutAdviceFactory);
-            tegg_metadata_1.EggPrototypeLifecycleUtil.registerLifecycle(eggPrototypeCrossCutHook);
-            tegg_metadata_1.LoadUnitLifecycleUtil.registerLifecycle(loadUnitAopHook);
-            tegg_runtime_1.EggObjectLifecycleUtil.registerLifecycle(eggObjectAopHook);
-        });
-        it('should throw', async () => {
-            await assert_1.default.rejects(async () => {
-                await CoreTestHelper_1.CoreTestHelper.prepareModules([
-                    path_1.default.join(__dirname, '..'),
-                    path_1.default.join(__dirname, 'fixtures/modules/should_throw'),
-                ]);
-            }, /Aop Advice\(PointcutAdvice\) not found in loadUnits/);
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW9wLXJ1bnRpbWUudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Rlc3QvYW9wLXJ1bnRpbWUudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGdEQUF3QjtBQUN4Qiw0Q0FBb0I7QUFDcEIsb0RBQTRCO0FBQzVCLHNEQUF3RztBQUN4Ryx3REFBeUc7QUFDekcsd0RBQTZEO0FBQzdELCtDQUFpRDtBQUNqRCxrRUFBMEU7QUFDMUUsbUVBQWdFO0FBQ2hFLDhEQUEyRDtBQUMzRCw0REFBeUQ7QUFDekQsOEVBQTJFO0FBRTNFLFFBQVEsQ0FBQywwQkFBMEIsRUFBRSxHQUFHLEVBQUU7SUFDeEMsUUFBUSxDQUFDLGNBQWMsRUFBRSxHQUFHLEVBQUU7UUFDNUIsSUFBSSxPQUFnQyxDQUFDO1FBQ3JDLElBQUkscUJBQTRDLENBQUM7UUFDakQsSUFBSSxnQkFBa0MsQ0FBQztRQUN2QyxJQUFJLGVBQWdDLENBQUM7UUFDckMsSUFBSSx3QkFBa0QsQ0FBQztRQUV2RCxVQUFVLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDcEIscUJBQXFCLEdBQUcsSUFBSSxxQ0FBcUIsRUFBRSxDQUFDO1lBQ3BELGdCQUFnQixHQUFHLElBQUksbUNBQWdCLEVBQUUsQ0FBQztZQUMxQyxlQUFlLEdBQUcsSUFBSSxpQ0FBZSxDQUFDLHFCQUFxQixDQUFDLENBQUM7WUFDN0Qsd0JBQXdCLEdBQUcsSUFBSSxtREFBd0IsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1lBQy9FLHlDQUF5QixDQUFDLGlCQUFpQixDQUFDLHdCQUF3QixDQUFDLENBQUM7WUFDdEUscUNBQXFCLENBQUMsaUJBQWlCLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDekQscUNBQXNCLENBQUMsaUJBQWlCLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUUzRCxPQUFPLEdBQUcsTUFBTSwrQkFBYyxDQUFDLGNBQWMsQ0FBQztnQkFDNUMsY0FBSSxDQUFDLElBQUksQ0FBQyxTQUFT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

package/dist/aop-runtime/test/fixtures/modules/hello_succeed/Hello.d.ts

@@ -1,30 +0,0 @@
-import { AdviceContext, IAdvice } from '@eggjs/aop-decorator';
-export interface CallTraceMsg {
-    className: string;
-    methodName: string;
-    id: number;
-    name: string;
-    result?: string;
-}
-export declare class CallTrace {
-    msgs: Array<CallTraceMsg>;
-    addMsg(msg: CallTraceMsg): void;
-}
-export declare class PointcutAdvice implements IAdvice<Hello> {
-    callTrace: CallTrace;
-    beforeCall(ctx: AdviceContext<Hello>): Promise<void>;
-    afterReturn(ctx: AdviceContext<Hello>, result: any): Promise<void>;
-    afterFinally(ctx: AdviceContext<Hello>): Promise<void>;
-    around(ctx: AdviceContext<Hello>, next: () => Promise<any>): Promise<any>;
-}
-export declare class Hello {
-    id: number;
-    hello(name: string): Promise<string>;
-}
-export declare class CrosscutAdvice implements IAdvice<Hello> {
-    callTrace: CallTrace;
-    beforeCall(ctx: AdviceContext<Hello>): Promise<void>;
-    afterReturn(ctx: AdviceContext<Hello>, result: any): Promise<void>;
-    afterFinally(ctx: AdviceContext<Hello>): Promise<void>;
-    around(ctx: AdviceContext<Hello>, next: () => Promise<any>): Promise<any>;
-}

package/dist/aop-runtime/test/fixtures/modules/hello_succeed/Hello.js

@@ -1,131 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var PointcutAdvice_1, CrosscutAdvice_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrosscutAdvice = exports.Hello = exports.PointcutAdvice = exports.CallTrace = void 0;
-const core_decorator_1 = require("@eggjs/core-decorator");
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-let CallTrace = class CallTrace {
-    constructor() {
-        this.msgs = [];
-    }
-    addMsg(msg) {
-        this.msgs.push(msg);
-    }
-};
-CallTrace = __decorate([
-    (0, core_decorator_1.SingletonProto)()
-], CallTrace);
-exports.CallTrace = CallTrace;
-let PointcutAdvice = PointcutAdvice_1 = class PointcutAdvice {
-    async beforeCall(ctx) {
-        this.callTrace.addMsg({
-            className: PointcutAdvice_1.name,
-            methodName: 'beforeCall',
-            id: ctx.that.id,
-            name: ctx.args[0],
-        });
-    }
-    async afterReturn(ctx, result) {
-        this.callTrace.addMsg({
-            className: PointcutAdvice_1.name,
-            methodName: 'afterReturn',
-            id: ctx.that.id,
-            name: ctx.args[0],
-            result,
-        });
-    }
-    async afterFinally(ctx) {
-        this.callTrace.addMsg({
-            className: PointcutAdvice_1.name,
-            methodName: 'afterFinally',
-            id: ctx.that.id,
-            name: ctx.args[0],
-        });
-    }
-    async around(ctx, next) {
-        ctx.args[0] = `withPointAroundParam(${ctx.args[0]})`;
-        const result = await next();
-        return `withPointAroundResult(${result})`;
-    }
-};
-__decorate([
-    (0, core_decorator_1.Inject)(),
-    __metadata("design:type", CallTrace)
-], PointcutAdvice.prototype, "callTrace", void 0);
-PointcutAdvice = PointcutAdvice_1 = __decorate([
-    (0, aop_decorator_1.Advice)()
-], PointcutAdvice);
-exports.PointcutAdvice = PointcutAdvice;
-let Hello = class Hello {
-    constructor() {
-        this.id = 233;
-    }
-    async hello(name) {
-        return `hello ${name}`;
-    }
-};
-__decorate([
-    (0, aop_decorator_1.Pointcut)(PointcutAdvice),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], Hello.prototype, "hello", null);
-Hello = __decorate([
-    (0, core_decorator_1.ContextProto)()
-], Hello);
-exports.Hello = Hello;
-let CrosscutAdvice = CrosscutAdvice_1 = class CrosscutAdvice {
-    async beforeCall(ctx) {
-        this.callTrace.addMsg({
-            className: CrosscutAdvice_1.name,
-            methodName: 'beforeCall',
-            id: ctx.that.id,
-            name: ctx.args[0],
-        });
-    }
-    async afterReturn(ctx, result) {
-        this.callTrace.addMsg({
-            className: CrosscutAdvice_1.name,
-            methodName: 'afterReturn',
-            id: ctx.that.id,
-            name: ctx.args[0],
-            result,
-        });
-    }
-    async afterFinally(ctx) {
-        this.callTrace.addMsg({
-            className: CrosscutAdvice_1.name,
-            methodName: 'afterFinally',
-            id: ctx.that.id,
-            name: ctx.args[0],
-        });
-    }
-    async around(ctx, next) {
-        ctx.args[0] = `withCrosscutAroundParam(${ctx.args[0]})`;
-        const result = await next();
-        return `withCrossAroundResult(${result})`;
-    }
-};
-__decorate([
-    (0, core_decorator_1.Inject)(),
-    __metadata("design:type", CallTrace)
-], CrosscutAdvice.prototype, "callTrace", void 0);
-CrosscutAdvice = CrosscutAdvice_1 = __decorate([
-    (0, aop_decorator_1.Crosscut)({
-        type: aop_decorator_1.PointcutType.CLASS,
-        clazz: Hello,
-        methodName: 'hello',
-    }),
-    (0, aop_decorator_1.Advice)()
-], CrosscutAdvice);
-exports.CrosscutAdvice = CrosscutAdvice;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVsbG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi90ZXN0L2ZpeHR1cmVzL21vZHVsZXMvaGVsbG9fc3VjY2VlZC9IZWxsby50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7O0FBQUEsMERBQTZFO0FBQzdFLHdEQUF3RztBQVdqRyxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVM7SUFBZjtRQUNMLFNBQUksR0FBd0IsRUFBRSxDQUFDO0lBS2pDLENBQUM7SUFIQyxNQUFNLENBQUMsR0FBaUI7UUFDdEIsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEIsQ0FBQztDQUNGLENBQUE7QUFOWSxTQUFTO0lBRHJCLElBQUEsK0JBQWMsR0FBRTtHQUNKLFNBQVMsQ0FNckI7QUFOWSw4QkFBUztBQVNmLElBQU0sY0FBYyxzQkFBcEIsTUFBTSxjQUFjO0lBSXpCLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBeUI7UUFDeEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUM7WUFDcEIsU0FBUyxFQUFFLGdCQUFjLENBQUMsSUFBSTtZQUM5QixVQUFVLEVBQUUsWUFBWTtZQUN4QixFQUFFLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ2YsSUFBSSxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1NBQ2xCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVyxDQUFDLEdBQXlCLEVBQUUsTUFBVztRQUN0RCxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQztZQUNwQixTQUFTLEVBQUUsZ0JBQWMsQ0FBQyxJQUFJO1lBQzlCLFVBQVUsRUFBRSxhQUFhO1lBQ3pCLEVBQUUsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDZixJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDakIsTUFB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

package/dist/aop-runtime/test/fixtures/modules/should_throw/Hello.d.ts

@@ -1,4 +0,0 @@
-export declare class Hello {
-    id: number;
-    hello(name: string): Promise<string>;
-}

package/dist/aop-runtime/test/fixtures/modules/should_throw/Hello.js

@@ -1,41 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hello = void 0;
-const core_decorator_1 = require("@eggjs/core-decorator");
-const aop_decorator_1 = require("@eggjs/aop-decorator");
-let PointcutAdvice = class PointcutAdvice {
-    async beforeCall(ctx) {
-        console.info(ctx);
-    }
-};
-PointcutAdvice = __decorate([
-    (0, aop_decorator_1.Advice)()
-], PointcutAdvice);
-let Hello = class Hello {
-    constructor() {
-        this.id = 233;
-    }
-    async hello(name) {
-        return `hello ${name}`;
-    }
-};
-__decorate([
-    (0, aop_decorator_1.Pointcut)(PointcutAdvice),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], Hello.prototype, "hello", null);
-Hello = __decorate([
-    (0, core_decorator_1.ContextProto)()
-], Hello);
-exports.Hello = Hello;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVsbG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi90ZXN0L2ZpeHR1cmVzL21vZHVsZXMvc2hvdWxkX3Rocm93L0hlbGxvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDBEQUFxRDtBQUNyRCx3REFBZ0Y7QUFHaEYsSUFBTSxjQUFjLEdBQXBCLE1BQU0sY0FBYztJQUNsQixLQUFLLENBQUMsVUFBVSxDQUFDLEdBQXlCO1FBQ3hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDcEIsQ0FBQztDQUNGLENBQUE7QUFKSyxjQUFjO0lBRG5CLElBQUEsc0JBQU0sR0FBRTtHQUNILGNBQWMsQ0FJbkI7QUFHTSxJQUFNLEtBQUssR0FBWCxNQUFNLEtBQUs7SUFBWDtRQUNMLE9BQUUsR0FBRyxHQUFHLENBQUM7SUFNWCxDQUFDO0lBSE8sQUFBTixLQUFLLENBQUMsS0FBSyxDQUFDLElBQVk7UUFDdEIsT0FBTyxTQUFTLElBQUksRUFBRSxDQUFDO0lBQ3pCLENBQUM7Q0FDRixDQUFBO0FBSE87SUFETCxJQUFBLHdCQUFRLEVBQUMsY0FBYyxDQUFDOzs7O2tDQUd4QjtBQU5VLEtBQUs7SUFEakIsSUFBQSw2QkFBWSxHQUFFO0dBQ0YsS0FBSyxDQU9qQjtBQVBZLHNCQUFLIn0=

package/dist/test-util/CoreTestHelper.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="node" />
-import { EggContext, LoadUnitInstance } from '@eggjs/tegg-runtime';
-import { EggProtoImplClass } from '@eggjs/core-decorator';
-import { AsyncLocalStorage } from 'async_hooks';
-export declare class EggContextStorage {
-    static storage: AsyncLocalStorage<EggContext>;
-    static register(): void;
-}
-export declare class CoreTestHelper {
-    static contextStorage: AsyncLocalStorage<unknown>;
-    static getLoadUnitInstance(moduleDir: string): Promise<LoadUnitInstance>;
-    static prepareModules(moduleDirs: string[]): Promise<Array<LoadUnitInstance>>;
-    static getObject<T>(clazz: EggProtoImplClass<T>): Promise<T>;
-}

package/dist/test-util/CoreTestHelper.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreTestHelper = exports.EggContextStorage = void 0;
-const tegg_runtime_1 = require("@eggjs/tegg-runtime");
-const tegg_metadata_1 = require("@eggjs/tegg-metadata");
-const tegg_loader_1 = require("@eggjs/tegg-loader");
-const core_decorator_1 = require("@eggjs/core-decorator");
-const async_hooks_1 = require("async_hooks");
-class EggContextStorage {
-    static register() {
-        tegg_runtime_1.ContextHandler.getContextCallback = () => {
-            return EggContextStorage.storage.getStore();
-        };
-        tegg_runtime_1.ContextHandler.runInContextCallback = (context, fn) => {
-            return EggContextStorage.storage.run(context, fn);
-        };
-    }
-}
-exports.EggContextStorage = EggContextStorage;
-EggContextStorage.storage = new async_hooks_1.AsyncLocalStorage();
-class CoreTestHelper {
-    static async getLoadUnitInstance(moduleDir) {
-        const loader = tegg_loader_1.LoaderFactory.createLoader(moduleDir, tegg_metadata_1.EggLoadUnitType.MODULE);
-        const loadUnit = await tegg_metadata_1.LoadUnitFactory.createLoadUnit(moduleDir, tegg_metadata_1.EggLoadUnitType.MODULE, loader);
-        return await tegg_runtime_1.LoadUnitInstanceFactory.createLoadUnitInstance(loadUnit);
-    }
-    static async prepareModules(moduleDirs) {
-        EggContextStorage.register();
-        const instances = [];
-        for (const moduleDir of moduleDirs) {
-            instances.push(await CoreTestHelper.getLoadUnitInstance(moduleDir));
-        }
-        return instances;
-    }
-    static async getObject(clazz) {
-        const proto = core_decorator_1.PrototypeUtil.getClazzProto(clazz);
-        const eggObj = await tegg_runtime_1.EggContainerFactory.getOrCreateEggObject(proto, proto.name);
-        return eggObj.obj;
-    }
-}
-exports.CoreTestHelper = CoreTestHelper;
-CoreTestHelper.contextStorage = new async_hooks_1.AsyncLocalStorage();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29yZVRlc3RIZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90ZXN0LXV0aWwvQ29yZVRlc3RIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0RBTTZCO0FBQzdCLHdEQUFzRjtBQUN0RixvREFBbUQ7QUFDbkQsMERBQXlFO0FBQ3pFLDZDQUFnRDtBQUVoRCxNQUFhLGlCQUFpQjtJQUc1QixNQUFNLENBQUMsUUFBUTtRQUNiLDZCQUFjLENBQUMsa0JBQWtCLEdBQUcsR0FBRyxFQUFFO1lBQ3ZDLE9BQU8saUJBQWlCLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQzlDLENBQUMsQ0FBQztRQUNGLDZCQUFjLENBQUMsb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUU7WUFDcEQsT0FBTyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUM7SUFDSixDQUFDOztBQVZILDhDQVdDO0FBVlEseUJBQU8sR0FBRyxJQUFJLCtCQUFpQixFQUFjLENBQUM7QUFZdkQsTUFBYSxjQUFjO0lBR3pCLE1BQU0sQ0FBQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsU0FBaUI7UUFDaEQsTUFBTSxNQUFNLEdBQUcsMkJBQWEsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLCtCQUFlLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0UsTUFBTSxRQUFRLEdBQUcsTUFBTSwrQkFBZSxDQUFDLGNBQWMsQ0FBQyxTQUFTLEVBQUUsK0JBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDakcsT0FBTyxNQUFNLHNDQUF1QixDQUFDLHNCQUFzQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFDRCxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxVQUFvQjtRQUM5QyxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM3QixNQUFNLFNBQVMsR0FBNEIsRUFBRSxDQUFDO1FBQzlDLEtBQUssTUFBTSxTQUFTLElBQUksVUFBVSxFQUFFO1lBQ2xDLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxjQUFjLENBQUMsbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztTQUNyRTtRQUNELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBSSxLQUEyQjtRQUNuRCxNQUFNLEtBQUssR0FBRyw4QkFBYSxDQUFDLGFBQWEsQ0FBQyxLQUFZLENBQWlCLENBQUM7UUFDeEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxrQ0FBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sTUFBTSxDQUFDLEdBQW1CLENBQUM7SUFDcEMsQ0FBQzs7QUFwQkgsd0NBcUJDO0FBcEJRLDZCQUFjLEdBQUcsSUFBSSwrQkFBaUIsRUFBRSxDQUFDIn0=