phecda-server 6.1.0 → 7.0.0-alpha.0

package/dist/{chunk-JDV2XJYE.js → chunk-MBCHNDAY.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkTVT62GIXjs = require('./chunk-TVT62GIX.js');
+var _chunkJ5CFUN4Vjs = require('./chunk-J5CFUN4V.js');
 
 // src/decorators/param.ts
 var _phecdacore = require('phecda-core');
@@ -10,42 +10,42 @@ function BaseParam(data) {
     _phecdacore.setMeta.call(void 0, target, property, index, data);
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, BaseParam, "BaseParam");
+_chunkJ5CFUN4Vjs.__name.call(void 0, BaseParam, "BaseParam");
 function Body(key = "") {
   return BaseParam({
     type: "body",
     key
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, Body, "Body");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Body, "Body");
 function Head(key) {
   return BaseParam({
     type: "headers",
     key: key.toLowerCase()
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, Head, "Head");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Head, "Head");
 function Query(key = "") {
   return BaseParam({
     type: "query",
     key
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, Query, "Query");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Query, "Query");
 function Param(key) {
   return BaseParam({
     type: "params",
     key
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, Param, "Param");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Param, "Param");
 function Arg(target, k, index) {
   BaseParam({
     type: "args",
     key: `${index}`
   })(target, k, index);
 }
-_chunkTVT62GIXjs.__name.call(void 0, Arg, "Arg");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Arg, "Arg");
 
 // src/decorators/aop.ts
 
@@ -56,23 +56,15 @@ function Guard(...guards) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Guard, "Guard");
-function Plugin(...plugins) {
+_chunkJ5CFUN4Vjs.__name.call(void 0, Guard, "Guard");
+function Addon(...addons) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
-      plugins
+      addons
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Plugin, "Plugin");
-function Interceptor(...interceptors) {
-  return (target, property) => {
-    _phecdacore.setMeta.call(void 0, target, property, void 0, {
-      interceptors
-    });
-  };
-}
-_chunkTVT62GIXjs.__name.call(void 0, Interceptor, "Interceptor");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Addon, "Addon");
 function Filter(filter) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
@@ -80,7 +72,7 @@ function Filter(filter) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Filter, "Filter");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Filter, "Filter");
 function Pipe(pipe) {
   return (target, property, index) => {
     if (typeof index === "number") {
@@ -94,7 +86,7 @@ function Pipe(pipe) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Pipe, "Pipe");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Pipe, "Pipe");
 
 // src/decorators/http.ts
 
@@ -108,7 +100,7 @@ function Route(route, type) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Route, "Route");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Route, "Route");
 function Header(headers) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
@@ -118,31 +110,31 @@ function Header(headers) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Header, "Header");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Header, "Header");
 function Get(route = "") {
   return Route(route, "get");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Get, "Get");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Get, "Get");
 function Post(route = "") {
   return Route(route, "post");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Post, "Post");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Post, "Post");
 function Put(route = "") {
   return Route(route, "put");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Put, "Put");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Put, "Put");
 function Search(route = "") {
   return Route(route, "search");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Search, "Search");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Search, "Search");
 function Patch(route = "") {
   return Route(route, "patch");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Patch, "Patch");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Patch, "Patch");
 function Delete(route = "") {
   return Route(route, "delete");
 }
-_chunkTVT62GIXjs.__name.call(void 0, Delete, "Delete");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Delete, "Delete");
 function Controller(prefix = "") {
   return (target) => {
     _phecdacore.setMeta.call(void 0, target, void 0, void 0, {
@@ -153,7 +145,7 @@ function Controller(prefix = "") {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Controller, "Controller");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Controller, "Controller");
 
 // src/decorators/rpc.ts
 
@@ -167,7 +159,7 @@ function Queue(queue = "", isEvent) {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Queue, "Queue");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Queue, "Queue");
 function Rpc() {
   return (target) => {
     _phecdacore.setMeta.call(void 0, target, void 0, void 0, {
@@ -175,11 +167,11 @@ function Rpc() {
     });
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Rpc, "Rpc");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Rpc, "Rpc");
 
 // src/decorators/ctx.ts
 
-var Ctx = /* @__PURE__ */ _chunkTVT62GIXjs.__name.call(void 0, (target, property) => {
+var Ctx = /* @__PURE__ */ _chunkJ5CFUN4Vjs.__name.call(void 0, (target, property) => {
   _phecdacore.setMeta.call(void 0, target, _phecdacore.SHARE_KEY, void 0, {
     ctxs: [
       property
@@ -208,8 +200,7 @@ function Define(key, value) {
     }
   };
 }
-_chunkTVT62GIXjs.__name.call(void 0, Define, "Define");
-
+_chunkJ5CFUN4Vjs.__name.call(void 0, Define, "Define");
 
 
 
@@ -235,4 +226,4 @@ _chunkTVT62GIXjs.__name.call(void 0, Define, "Define");
 
 
 
-exports.BaseParam = BaseParam; exports.Body = Body; exports.Head = Head; exports.Query = Query; exports.Param = Param; exports.Arg = Arg; exports.Guard = Guard; exports.Plugin = Plugin; exports.Interceptor = Interceptor; exports.Filter = Filter; exports.Pipe = Pipe; exports.Route = Route; exports.Header = Header; exports.Get = Get; exports.Post = Post; exports.Put = Put; exports.Search = Search; exports.Patch = Patch; exports.Delete = Delete; exports.Controller = Controller; exports.Queue = Queue; exports.Rpc = Rpc; exports.Ctx = Ctx; exports.Define = Define;
+exports.BaseParam = BaseParam; exports.Body = Body; exports.Head = Head; exports.Query = Query; exports.Param = Param; exports.Arg = Arg; exports.Guard = Guard; exports.Addon = Addon; exports.Filter = Filter; exports.Pipe = Pipe; exports.Route = Route; exports.Header = Header; exports.Get = Get; exports.Post = Post; exports.Put = Put; exports.Search = Search; exports.Patch = Patch; exports.Delete = Delete; exports.Controller = Controller; exports.Queue = Queue; exports.Rpc = Rpc; exports.Ctx = Ctx; exports.Define = Define;

package/dist/{chunk-2CFYUXPM.mjs → chunk-P75VKZJY.mjs}

@@ -1,11 +1,10 @@
 import {
   ERROR_SYMBOL,
   IS_HMR,
-  IS_STRICT,
   LOG_LEVEL,
   __name,
   log
-} from "./chunk-G7TD2VB7.mjs";
+} from "./chunk-WHJ5FALK.mjs";
 
 // src/helper.ts
 import pc from "picocolors";
@@ -228,143 +227,120 @@ var Context = class _Context {
     default: defaultPipe
   };
   static guardRecord = {};
-  static interceptorRecord = {};
-  static pluginRecord = {};
-  postInterceptors;
+  static addonRecord = {};
   constructor(data) {
     this.data = data;
     if (IS_HMR)
       data._context = this;
   }
-  async run(opts, successCb, failCb) {
-    const { meta, moduleMap } = this.data;
-    const { globalGuards = [], globalFilter, globalInterceptors = [], globalPipe } = opts;
-    const { paramsType, data: { guards, interceptors, params, tag, func, ctxs, filter } } = meta;
-    try {
-      await this.useGuard([
+  static getAop(meta, opts) {
+    const { globalGuards = [], globalFilter = "default", globalPipe = "default" } = opts;
+    const { data: { guards, filter, params } } = meta;
+    return {
+      guards: this.getGuards([
         ...globalGuards,
         ...guards
-      ]);
-      const i1 = await this.useInterceptor([
-        ...globalInterceptors,
-        ...interceptors
-      ]);
-      if (i1 !== void 0) return successCb(i1);
-      const args = await this.usePipe(params.map((param) => {
-        return {
-          arg: resolveDep(this.data[param.type], param.key),
-          reflect: paramsType[param.index],
-          ...param,
-          pipe: param.pipe || globalPipe
+      ]),
+      pipe: this.getPipe(params.map((item) => item.pipe || globalPipe)),
+      filter: this.getFilter(filter || globalFilter)
+    };
+  }
+  async run({ guards, filter, pipe }, successCb, failCb) {
+    const { meta, moduleMap } = this.data;
+    const { paramsType, data: { ctxs, tag, params, func } } = meta;
+    try {
+      let res;
+      const nextHandler = /* @__PURE__ */ __name((index) => {
+        return async () => {
+          if (index === guards.length) {
+            const instance = moduleMap.get(tag);
+            if (ctxs) {
+              ctxs.forEach((ctx) => instance[ctx] = this.data);
+            }
+            const args = await Promise.all(params.map((item, i) => pipe[i]({
+              arg: resolveDep(this.data[item.type], item.key),
+              reflect: paramsType[item.index],
+              ...item
+            }, this.data)));
+            res = await instance[func](...args);
+          } else {
+            let nextPromise;
+            async function next() {
+              return nextPromise = nextHandler(index + 1)().then((ret2) => {
+                if (ret2 !== void 0) {
+                  debug(`The ${index + 1}th guard rewrite the response value.`);
+                  res = ret2;
+                }
+                return res;
+              });
+            }
+            __name(next, "next");
+            const ret = await guards[index](this.data, next);
+            if (ret !== void 0) {
+              res = ret;
+            } else {
+              if (!nextPromise) await next();
+              else await nextPromise;
+            }
+          }
         };
-      }));
-      const instance = moduleMap.get(tag);
-      if (ctxs) {
-        ctxs.forEach((ctx) => instance[ctx] = this.data);
-      }
-      const returnData = await instance[func](...args);
-      const i2 = await this.usePostInterceptor(returnData);
-      if (i2 !== void 0) return successCb(i2);
-      return successCb(returnData);
+      }, "nextHandler");
+      await nextHandler(0)();
+      return successCb(res);
     } catch (e) {
-      const err = await this.useFilter(e, filter || globalFilter);
+      const err = await filter(e, this.data);
       return failCb(err);
     }
   }
-  usePipe(args) {
-    return Promise.all(args.map((item) => {
-      if (item.pipe && !_Context.pipeRecord[item.pipe]) {
-        if (IS_STRICT) {
-          throw new FrameworkException(`can't find pipe named '${item.pipe}'`);
-        } else {
-          debug(`Can't find pipe named "${item.pipe}" when handling the ${item.index + 1}th argument of the func "${this.data.func}" on module "${this.data.tag}",use default pipe instead`);
-          return _Context.pipeRecord.default(item, this.data);
-        }
-      }
-      return _Context.pipeRecord[item.pipe || "default"](item, this.data);
-    }));
-  }
-  useFilter(arg, filter = "default") {
-    if (!_Context.filterRecord[filter]) {
-      if (IS_STRICT) {
-        throw new FrameworkException(`can't find filter named "${filter}"`);
-      } else {
-        debug(`Can't find filter named "${filter}" when handling func "${this.data.func}" on module "${this.data.tag}",use default filter instead`);
-        return _Context.filterRecord.default(arg, this.data);
-      }
-    }
-    return _Context.filterRecord[filter](arg, this.data);
-  }
-  async useGuard(guards) {
-    for (const guard of new Set(guards)) {
-      if (!(guard in _Context.guardRecord)) {
-        if (IS_STRICT) throw new FrameworkException(`Can't find guard named "${guard}"`);
-        else debug(`Can't find guard named "${guard}" when handling func "${this.data.func}" on module "${this.data.tag}",skip it`);
-        continue;
-      }
-      if (!await _Context.guardRecord[guard](this.data)) throw new ForbiddenException(`Guard exception--[${guard}]`);
-    }
+  static getPipe(pipe) {
+    return pipe.map((pipe2) => {
+      return _Context.pipeRecord[pipe2] || _Context.pipeRecord.default;
+    });
   }
-  async usePostInterceptor(data) {
-    for (const cb of this.postInterceptors) {
-      const ret = await cb(data);
-      if (ret !== void 0) return ret;
-    }
+  static getFilter(filter = "default") {
+    return _Context.filterRecord[filter] || _Context.filterRecord.default;
   }
-  async useInterceptor(interceptors) {
-    const cb = [];
-    for (const interceptor of new Set(interceptors)) {
-      if (!(interceptor in _Context.interceptorRecord)) {
-        if (IS_STRICT) throw new FrameworkException(`can't find interceptor named "${interceptor}"`);
-        else debug(`Can't find interceptor named "${interceptor}" when handling func "${this.data.func}" on module "${this.data.tag}",skip it`);
-        continue;
-      }
-      const interceptRet = await _Context.interceptorRecord[interceptor](this.data);
-      if (interceptRet !== void 0) {
-        if (typeof interceptRet === "function") cb.push(interceptRet);
-        else return interceptRet;
-      }
+  static getGuards(guards) {
+    const ret = [];
+    for (const guard of new Set(guards)) {
+      if (guard in _Context.guardRecord) ret.push(_Context.guardRecord[guard]);
     }
-    this.postInterceptors = cb;
+    return ret.sort((a, b) => b.priority - a.priority).map((item) => item.value);
   }
-  static usePlugin(plugins, framework) {
+  static applyAddons(addons, router, framework) {
     const ret = [];
-    for (const m of new Set(plugins)) {
-      if (!(m in _Context.pluginRecord)) {
-        if (IS_STRICT) throw new FrameworkException(`can't find middleware named '${m}'`);
-        continue;
-      }
-      const plugin = _Context.pluginRecord[m](framework);
-      plugin && ret.push(plugin);
+    for (const a of new Set(addons)) {
+      if (a in _Context.addonRecord) ret.push(_Context.addonRecord[a]);
     }
-    return ret;
+    ret.sort((a, b) => b.priority - a.priority).forEach((item) => item.value(router, framework));
   }
 };
-function addPlugin(key, handler) {
-  if (Context.pluginRecord[key] && Context.pluginRecord[key] !== handler) log(`overwrite Plugin "${String(key)}"`, "warn");
-  Context.pluginRecord[key] = handler;
-}
-__name(addPlugin, "addPlugin");
-function addPipe(key, handler) {
-  if (Context.pipeRecord[key] && Context.pipeRecord[key] !== handler) log(`overwrite Pipe "${String(key)}"`, "warn");
-  Context.pipeRecord[key] = handler;
+function addPipe(key, pipe) {
+  if (Context.pipeRecord[key] && Context.pipeRecord[key] !== pipe) log(`overwrite Pipe "${String(key)}"`, "warn");
+  Context.pipeRecord[key] = pipe;
 }
 __name(addPipe, "addPipe");
-function addFilter(key, handler) {
-  if (Context.filterRecord[key] && Context.filterRecord[key] !== handler) log(`overwrite Filter "${String(key)}"`, "warn");
-  Context.filterRecord[key] = handler;
+function addFilter(key, filter) {
+  if (Context.filterRecord[key] && Context.filterRecord[key] !== filter) log(`overwrite Filter "${String(key)}"`, "warn");
+  Context.filterRecord[key] = filter;
 }
 __name(addFilter, "addFilter");
-function addGuard(key, handler) {
-  if (Context.guardRecord[key] && Context.guardRecord[key] !== handler) log(`overwrite Guard "${String(key)}"`, "warn");
-  Context.guardRecord[key] = handler;
+function addGuard(key, guard, priority = 0) {
+  if (Context.guardRecord[key] && Context.guardRecord[key].value !== guard) log(`overwrite Guard "${String(key)}"`, "warn");
+  Context.guardRecord[key] = {
+    value: guard,
+    priority
+  };
 }
 __name(addGuard, "addGuard");
-function addInterceptor(key, handler) {
-  if (Context.interceptorRecord[key] && Context.interceptorRecord[key] !== handler) log(`overwrite Interceptor "${String(key)}"`, "warn");
-  Context.interceptorRecord[key] = handler;
+function addAddon(key, addon, priority = 0) {
+  if (Context.addonRecord[key] && Context.addonRecord[key].value !== addon) log(`overwrite Addon "${String(key)}"`, "warn");
+  Context.addonRecord[key] = {
+    value: addon,
+    priority
+  };
 }
-__name(addInterceptor, "addInterceptor");
+__name(addAddon, "addAddon");
 
 // src/hmr.ts
 function HMR(cb) {
@@ -372,7 +348,7 @@ function HMR(cb) {
 }
 __name(HMR, "HMR");
 
-// src/server/helper.ts
+// src/http/helper.ts
 function resolveDep(ret, key) {
   if (key) return ret?.[key];
   return ret;
@@ -432,60 +408,50 @@ function createControllerMetaMap(meta, filter) {
   return metaMap;
 }
 __name(createControllerMetaMap, "createControllerMetaMap");
-function detectAopDep(meta, { guards, interceptors, plugins } = {}, controller = "http") {
-  const pluginSet = /* @__PURE__ */ new Set();
+function detectAopDep(meta, { guards, addons } = {}, controller = "http") {
+  const addonSet = /* @__PURE__ */ new Set();
   const guardSet = /* @__PURE__ */ new Set();
-  const interceptorSet = /* @__PURE__ */ new Set();
   const pipeSet = /* @__PURE__ */ new Set();
   const filterSet = /* @__PURE__ */ new Set();
   const warningSet = /* @__PURE__ */ new Set();
   function handleMeta() {
-    pluginSet.clear();
+    addonSet.clear();
     guardSet.clear();
-    interceptorSet.clear();
     pipeSet.clear();
     filterSet.clear();
     warningSet.clear();
-    plugins?.forEach((item) => {
-      pluginSet.add(item);
+    addons?.forEach((item) => {
+      addonSet.add(item);
     });
     guards?.forEach((item) => {
       guardSet.add(item);
     });
-    interceptors?.forEach((item) => {
-      interceptorSet.add(item);
-    });
     meta.forEach(({ data }) => {
       if (data.controller !== controller) {
         if (data[controller]) warningSet.add(`Module "${data.tag === data.name ? data.name : `${data.name}(${data.tag})`}"  should use ${controller} controller to decorate class or remove ${controller} decorator on method "${data.func}"`);
         return;
       }
       if (data.filter) filterSet.add(data.filter);
-      data.interceptors.forEach((i) => interceptorSet.add(i));
       data.guards.forEach((i) => guardSet.add(i));
-      data.plugins.forEach((i) => pluginSet.add(i));
+      data.addons.forEach((i) => addonSet.add(i));
       data.params.forEach((i) => {
         if (i.pipe) pipeSet.add(i.pipe);
       });
     });
-    const missPlugins = [
-      ...pluginSet
-    ].filter((i) => !Context.pluginRecord[i]);
+    const missAddons = [
+      ...addonSet
+    ].filter((i) => !Context.addonRecord[i]);
     const missGuards = [
       ...guardSet
     ].filter((i) => !Context.guardRecord[i]);
-    const missInterceptors = [
-      ...interceptorSet
-    ].filter((i) => !Context.interceptorRecord[i]);
     const missPipes = [
       ...pipeSet
     ].filter((i) => !Context.pipeRecord[i]);
     const missFilters = [
       ...filterSet
     ].filter((i) => !Context.filterRecord[i]);
-    if (missPlugins.length) log(`${pc.white(`Plugin [${missPlugins.join(",")}]`)} doesn't exist`, "warn");
+    if (missAddons.length) log(`${pc.white(`Addon [${missAddons.join(",")}]`)} doesn't exist`, "warn");
     if (missGuards.length) log(`${pc.magenta(`Guard [${missGuards.join(",")}]`)} doesn't exist`, "warn");
-    if (missInterceptors.length) log(`${pc.cyan(`Interceptor [${missInterceptors.join(",")}]`)} doesn't exist`, "warn");
     if (missPipes.length) log(`${pc.blue(`Pipe [${missPipes.join(",")}]`)} doesn't exist`, "warn");
     if (missFilters.length) log(`${pc.red(`Filter [${missFilters.join(",")}]`)} doesn't exist`, "warn");
     warningSet.forEach((warn) => log(warn, "warn"));
@@ -494,9 +460,8 @@ function detectAopDep(meta, { guards, interceptors, plugins } = {}, controller =
   handleMeta();
   HMR(handleMeta);
   return {
-    pluginSet,
+    addonSet,
     guardSet,
-    interceptorSet,
     pipeSet,
     filterSet
   };
@@ -523,11 +488,10 @@ export {
   TimerException,
   WorkerException,
   Context,
-  addPlugin,
   addPipe,
   addFilter,
   addGuard,
-  addInterceptor,
+  addAddon,
   HMR,
   resolveDep,
   argToReq,