phecda-server 5.0.2 → 5.1.1

package/dist/server/koa/index.js

@@ -4,95 +4,95 @@
 
 
 
-var _chunkYERBWZCSjs = require('../../chunk-YERBWZCS.js');
 
+var _chunkFSBD5R22js = require('../../chunk-FSBD5R22.js');
 
-var _chunkYR5Q5F2Kjs = require('../../chunk-YR5Q5F2K.js');
+
+var _chunkZP7HNASUjs = require('../../chunk-ZP7HNASU.js');
 
 // src/server/koa/bind.ts
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/koa");
-function bind(router, { moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
-    route: "/__PHECDA_SERVER__",
-    plugins: [],
-    ...opts
-  };
+function bind(router, data, opts = {}) {
+  const { globalGuards, globalInterceptors, parallelRoute = "/__PHECDA_SERVER__", globalPlugins = [], parallelPlugins = [], globalFilter, globalPipe } = opts;
+  const { moduleMap, meta } = data;
   const originStack = router.stack.slice(0, router.stack.length);
-  const metaMap = /* @__PURE__ */ new Map();
-  function handleMeta() {
-    metaMap.clear();
-    for (const item of meta) {
-      const { tag, func, controller, http } = item.data;
-      if (controller !== "http" || !_optionalChain([http, 'optionalAccess', _ => _.type]))
-        continue;
+  const metaMap = _chunkFSBD5R22js.createControllerMetaMap.call(void 0, meta, (meta2) => {
+    const { controller, http, func, tag } = meta2.data;
+    if (controller === "http" && _optionalChain([http, 'optionalAccess', _ => _.type])) {
       debug(`register method "${func}" in module "${tag}"`);
-      if (metaMap.has(tag))
-        metaMap.get(tag)[func] = item;
-      else
-        metaMap.set(tag, {
-          [func]: item
-        });
+      return true;
     }
-  }
-  _chunkYR5Q5F2Kjs.__name.call(void 0, handleMeta, "handleMeta");
-  async function createRoute() {
-    router.post(route, ..._chunkYERBWZCSjs.Context.usePlugin(plugins), async (ctx, next) => {
-      const { body } = ctx.request;
-      async function errorHandler(e) {
-        const error = await _chunkYERBWZCSjs.Context.filterRecord.default(e);
-        ctx.status = error.status;
-        ctx.body = error;
-      }
-      _chunkYR5Q5F2Kjs.__name.call(void 0, errorHandler, "errorHandler");
-      if (!Array.isArray(body))
-        return errorHandler(new (0, _chunkYERBWZCSjs.BadRequestException)("data format should be an array"));
-      try {
-        return Promise.all(body.map((item, i) => {
-          return new Promise(async (resolve) => {
-            const { tag, func } = item;
-            debug(`(parallel)invoke method "${func}" in module "${tag}"`);
-            if (!metaMap.has(tag))
-              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`module "${tag}" doesn't exist`)));
-            const meta2 = metaMap.get(tag)[func];
-            if (!meta2)
-              return resolve(await _chunkYERBWZCSjs.Context.filterRecord.default(new (0, _chunkYERBWZCSjs.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
-            const { data: { params } } = meta2;
-            const contextData = {
-              type: "koa",
-              index: i,
-              ctx,
-              meta: meta2,
-              moduleMap,
-              parallel: true,
-              next,
-              app: router,
-              ..._chunkYERBWZCSjs.argToReq.call(void 0, params, item.args, ctx.headers),
-              tag,
-              func
-            };
-            const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
-            context.run({
-              globalGuards,
-              globalInterceptors,
-              globalFilter,
-              globalPipe
-            }, resolve, resolve);
+  });
+  _chunkFSBD5R22js.detectAopDep.call(void 0, meta, {
+    plugins: [
+      ...globalPlugins,
+      ...parallelPlugins
+    ],
+    guards: globalGuards,
+    interceptors: globalInterceptors
+  });
+  registerRoute();
+  async function registerRoute() {
+    _chunkFSBD5R22js.Context.usePlugin(globalPlugins, "koa").forEach((p) => router.use(p));
+    if (parallelRoute) {
+      router.post(parallelRoute, ..._chunkFSBD5R22js.Context.usePlugin(parallelPlugins, "koa"), async (ctx, next) => {
+        const { body } = ctx.request;
+        async function errorHandler(e) {
+          const error = await _chunkFSBD5R22js.Context.filterRecord.default(e);
+          ctx.status = error.status;
+          ctx.body = error;
+        }
+        _chunkZP7HNASUjs.__name.call(void 0, errorHandler, "errorHandler");
+        if (!Array.isArray(body))
+          return errorHandler(new (0, _chunkFSBD5R22js.BadRequestException)("data format should be an array"));
+        try {
+          return Promise.all(body.map((item, i) => {
+            return new Promise(async (resolve) => {
+              const { tag, func } = item;
+              debug(`(parallel)invoke method "${func}" in module "${tag}"`);
+              if (!metaMap.has(tag))
+                return resolve(await _chunkFSBD5R22js.Context.filterRecord.default(new (0, _chunkFSBD5R22js.BadRequestException)(`module "${tag}" doesn't exist`)));
+              const meta2 = metaMap.get(tag)[func];
+              if (!meta2)
+                return resolve(await _chunkFSBD5R22js.Context.filterRecord.default(new (0, _chunkFSBD5R22js.BadRequestException)(`"${func}" in "${tag}" doesn't exist`)));
+              const { data: { params } } = meta2;
+              const contextData = {
+                type: "koa",
+                index: i,
+                ctx,
+                meta: meta2,
+                moduleMap,
+                parallel: true,
+                next,
+                app: router,
+                ..._chunkFSBD5R22js.argToReq.call(void 0, params, item.args, ctx.headers),
+                tag,
+                func
+              };
+              const context = new (0, _chunkFSBD5R22js.Context)(contextData);
+              context.run({
+                globalGuards,
+                globalInterceptors,
+                globalFilter,
+                globalPipe
+              }, resolve, resolve);
+            });
+          })).then((ret) => {
+            ctx.body = ret;
           });
-        })).then((ret) => {
-          ctx.body = ret;
-        });
-      } catch (e) {
-        return errorHandler(e);
-      }
-    });
+        } catch (e) {
+          return errorHandler(e);
+        }
+      });
+    }
     for (const [tag, record] of metaMap) {
       for (const func in record) {
         const meta2 = metaMap.get(tag)[func];
-        const { data: { plugins: plugins2, http } } = meta2;
+        const { data: { plugins, http } } = meta2;
         if (!_optionalChain([http, 'optionalAccess', _2 => _2.type]))
           continue;
-        router[http.type](http.prefix + http.route, ..._chunkYERBWZCSjs.Context.usePlugin(plugins2), async (ctx, next) => {
+        router[http.type](http.prefix + http.route, ..._chunkFSBD5R22js.Context.usePlugin(plugins, "koa"), async (ctx, next) => {
           debug(`invoke method "${func}" in module "${tag}"`);
           const contextData = {
             type: "koa",
@@ -108,7 +108,7 @@ function bind(router, { moduleMap, meta }, opts = {}) {
             headers: ctx.headers,
             next
           };
-          const context = new (0, _chunkYERBWZCSjs.Context)(contextData);
+          const context = new (0, _chunkFSBD5R22js.Context)(contextData);
           if (http.headers) {
             for (const name in http.headers)
               ctx.set(name, http.headers[name]);
@@ -132,26 +132,13 @@ function bind(router, { moduleMap, meta }, opts = {}) {
       }
     }
   }
-  _chunkYR5Q5F2Kjs.__name.call(void 0, createRoute, "createRoute");
-  _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
-    plugins,
-    guards: globalGuards,
-    interceptors: globalInterceptors
-  });
-  handleMeta();
-  createRoute();
-  _chunkYERBWZCSjs.HMR.call(void 0, async () => {
+  _chunkZP7HNASUjs.__name.call(void 0, registerRoute, "registerRoute");
+  _chunkFSBD5R22js.HMR.call(void 0, async () => {
     router.stack = originStack;
-    _chunkYERBWZCSjs.detectAopDep.call(void 0, meta, {
-      plugins,
-      guards: globalGuards,
-      interceptors: globalInterceptors
-    });
-    handleMeta();
-    createRoute();
+    registerRoute();
   });
 }
-_chunkYR5Q5F2Kjs.__name.call(void 0, bind, "bind");
+_chunkZP7HNASUjs.__name.call(void 0, bind, "bind");
 
 
 exports.bind = bind;

package/dist/server/koa/index.mjs

@@ -3,96 +3,96 @@ import {
   Context,
   HMR,
   argToReq,
+  createControllerMetaMap,
   detectAopDep
-} from "../../chunk-AB4OX3WV.mjs";
+} from "../../chunk-665MB62T.mjs";
 import {
   __name
-} from "../../chunk-ITTD2GBR.mjs";
+} from "../../chunk-VLV3AO3H.mjs";
 
 // src/server/koa/bind.ts
 import Debug from "debug";
 var debug = Debug("phecda-server/koa");
-function bind(router, { moduleMap, meta }, opts = {}) {
-  const { globalGuards, globalInterceptors, route, plugins, globalFilter, globalPipe } = {
-    route: "/__PHECDA_SERVER__",
-    plugins: [],
-    ...opts
-  };
+function bind(router, data, opts = {}) {
+  const { globalGuards, globalInterceptors, parallelRoute = "/__PHECDA_SERVER__", globalPlugins = [], parallelPlugins = [], globalFilter, globalPipe } = opts;
+  const { moduleMap, meta } = data;
   const originStack = router.stack.slice(0, router.stack.length);
-  const metaMap = /* @__PURE__ */ new Map();
-  function handleMeta() {
-    metaMap.clear();
-    for (const item of meta) {
-      const { tag, func, controller, http } = item.data;
-      if (controller !== "http" || !http?.type)
-        continue;
+  const metaMap = createControllerMetaMap(meta, (meta2) => {
+    const { controller, http, func, tag } = meta2.data;
+    if (controller === "http" && http?.type) {
       debug(`register method "${func}" in module "${tag}"`);
-      if (metaMap.has(tag))
-        metaMap.get(tag)[func] = item;
-      else
-        metaMap.set(tag, {
-          [func]: item
-        });
+      return true;
     }
-  }
-  __name(handleMeta, "handleMeta");
-  async function createRoute() {
-    router.post(route, ...Context.usePlugin(plugins), async (ctx, next) => {
-      const { body } = ctx.request;
-      async function errorHandler(e) {
-        const error = await Context.filterRecord.default(e);
-        ctx.status = error.status;
-        ctx.body = error;
-      }
-      __name(errorHandler, "errorHandler");
-      if (!Array.isArray(body))
-        return errorHandler(new BadRequestException("data format should be an array"));
-      try {
-        return Promise.all(body.map((item, i) => {
-          return new Promise(async (resolve) => {
-            const { tag, func } = item;
-            debug(`(parallel)invoke method "${func}" in module "${tag}"`);
-            if (!metaMap.has(tag))
-              return resolve(await Context.filterRecord.default(new BadRequestException(`module "${tag}" doesn't exist`)));
-            const meta2 = metaMap.get(tag)[func];
-            if (!meta2)
-              return resolve(await Context.filterRecord.default(new BadRequestException(`"${func}" in "${tag}" doesn't exist`)));
-            const { data: { params } } = meta2;
-            const contextData = {
-              type: "koa",
-              index: i,
-              ctx,
-              meta: meta2,
-              moduleMap,
-              parallel: true,
-              next,
-              app: router,
-              ...argToReq(params, item.args, ctx.headers),
-              tag,
-              func
-            };
-            const context = new Context(contextData);
-            context.run({
-              globalGuards,
-              globalInterceptors,
-              globalFilter,
-              globalPipe
-            }, resolve, resolve);
+  });
+  detectAopDep(meta, {
+    plugins: [
+      ...globalPlugins,
+      ...parallelPlugins
+    ],
+    guards: globalGuards,
+    interceptors: globalInterceptors
+  });
+  registerRoute();
+  async function registerRoute() {
+    Context.usePlugin(globalPlugins, "koa").forEach((p) => router.use(p));
+    if (parallelRoute) {
+      router.post(parallelRoute, ...Context.usePlugin(parallelPlugins, "koa"), async (ctx, next) => {
+        const { body } = ctx.request;
+        async function errorHandler(e) {
+          const error = await Context.filterRecord.default(e);
+          ctx.status = error.status;
+          ctx.body = error;
+        }
+        __name(errorHandler, "errorHandler");
+        if (!Array.isArray(body))
+          return errorHandler(new BadRequestException("data format should be an array"));
+        try {
+          return Promise.all(body.map((item, i) => {
+            return new Promise(async (resolve) => {
+              const { tag, func } = item;
+              debug(`(parallel)invoke method "${func}" in module "${tag}"`);
+              if (!metaMap.has(tag))
+                return resolve(await Context.filterRecord.default(new BadRequestException(`module "${tag}" doesn't exist`)));
+              const meta2 = metaMap.get(tag)[func];
+              if (!meta2)
+                return resolve(await Context.filterRecord.default(new BadRequestException(`"${func}" in "${tag}" doesn't exist`)));
+              const { data: { params } } = meta2;
+              const contextData = {
+                type: "koa",
+                index: i,
+                ctx,
+                meta: meta2,
+                moduleMap,
+                parallel: true,
+                next,
+                app: router,
+                ...argToReq(params, item.args, ctx.headers),
+                tag,
+                func
+              };
+              const context = new Context(contextData);
+              context.run({
+                globalGuards,
+                globalInterceptors,
+                globalFilter,
+                globalPipe
+              }, resolve, resolve);
+            });
+          })).then((ret) => {
+            ctx.body = ret;
           });
-        })).then((ret) => {
-          ctx.body = ret;
-        });
-      } catch (e) {
-        return errorHandler(e);
-      }
-    });
+        } catch (e) {
+          return errorHandler(e);
+        }
+      });
+    }
     for (const [tag, record] of metaMap) {
       for (const func in record) {
         const meta2 = metaMap.get(tag)[func];
-        const { data: { plugins: plugins2, http } } = meta2;
+        const { data: { plugins, http } } = meta2;
         if (!http?.type)
           continue;
-        router[http.type](http.prefix + http.route, ...Context.usePlugin(plugins2), async (ctx, next) => {
+        router[http.type](http.prefix + http.route, ...Context.usePlugin(plugins, "koa"), async (ctx, next) => {
           debug(`invoke method "${func}" in module "${tag}"`);
           const contextData = {
             type: "koa",
@@ -132,23 +132,10 @@ function bind(router, { moduleMap, meta }, opts = {}) {
       }
     }
   }
-  __name(createRoute, "createRoute");
-  detectAopDep(meta, {
-    plugins,
-    guards: globalGuards,
-    interceptors: globalInterceptors
-  });
-  handleMeta();
-  createRoute();
+  __name(registerRoute, "registerRoute");
   HMR(async () => {
     router.stack = originStack;
-    detectAopDep(meta, {
-      plugins,
-      guards: globalGuards,
-      interceptors: globalInterceptors
-    });
-    handleMeta();
-    createRoute();
+    registerRoute();
   });
 }
 __name(bind, "bind");

package/dist/test.d.ts

@@ -2,7 +2,7 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory, P as PickFunc } from './core-fd134ffa.js';
+import { F as Factory, P as PickFunc } from './core-39f27fe8.js';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Module: C): InstanceType<C>;

package/dist/test.js

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkF5YWXY5Wjs = require('./chunk-F5YWXY5W.js');
+var _chunkHMPTPTFLjs = require('./chunk-HMPTPTFL.js');
 
 
-var _chunkYR5Q5F2Kjs = require('./chunk-YR5Q5F2K.js');
+var _chunkZP7HNASUjs = require('./chunk-ZP7HNASU.js');
 
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, constructorMap } = await _chunkF5YWXY5Wjs.Factory.call(void 0, Modules);
+  const { moduleMap, constructorMap } = await _chunkHMPTPTFLjs.Factory.call(void 0, Modules);
   return {
     get(Module) {
       const tag = _phecdacore.getTag.call(void 0, Module);
@@ -21,7 +21,7 @@ async function TestFactory(...Modules) {
     }
   };
 }
-_chunkYR5Q5F2Kjs.__name.call(void 0, TestFactory, "TestFactory");
+_chunkZP7HNASUjs.__name.call(void 0, TestFactory, "TestFactory");
 async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
   const { default: request, agent } = await Promise.resolve().then(() => require("supertest"));
   const Agent = agent(app);
@@ -67,11 +67,11 @@ async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
       }
     });
   }
-  _chunkYR5Q5F2Kjs.__name.call(void 0, module, "module");
+  _chunkZP7HNASUjs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkYR5Q5F2Kjs.__name.call(void 0, TestHttp, "TestHttp");
+_chunkZP7HNASUjs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-RCTOVYZY.mjs";
+} from "./chunk-2HKQPZDT.mjs";
 import {
   __name
-} from "./chunk-ITTD2GBR.mjs";
+} from "./chunk-VLV3AO3H.mjs";
 
 // src/test.ts
 import { getTag } from "phecda-core";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "phecda-server",
-  "version": "5.0.2",
-  "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor ",
+  "version": "5.1.1",
+  "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -117,11 +117,12 @@
   },
   "keywords": [
     "server",
-    "express",
-    "types-share",
-    "fullstack"
+    "IOC",
+    "rpc",
+    "types-share"
   ],
-  "author": "",
+  "author": "fgsreally",
+  "repository": "https://github.com/fgsreally/phecda/tree/main/packages/server",
   "files": [
     "dist",
     "register",
@@ -143,7 +144,7 @@
     "elysia": "^1.0.17",
     "express": "^4.18.2",
     "fastify": "^4.25.1",
-    "h3": "^1.9.0",
+    "h3": "^1.11.1",
     "hono": "^4.3.4",
     "hyper-express": "^6.15.2",
     "ioredis": "^5.3.2",
@@ -155,7 +156,7 @@
     "nats": "^2.22.0",
     "supertest": "^6.3.3",
     "tsup": "^6.5.0",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.5",
     "unimport": "^3.7.1"
   },
   "dependencies": {

package/register/loader.mjs

@@ -67,9 +67,10 @@ export async function initialize(data) {
   if (!config.unimport)
     return
   unimportRet = await genUnImportRet(config.unimport)
-  await unimportRet.init()
   if (unimportRet) {
     log('auto import...')
+    await unimportRet.init()
+
     writeFile(
       config.unimport.dtsPath || dtsPath,
       handleClassTypes(await unimportRet.generateTypeDeclarations()),
@@ -120,9 +121,9 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
   // url import
+  // it seems useless
   if (/^file:\/\/\//.test(specifier) && extname(specifier) === '.ts') {
     const url = addUrlToGraph(specifier, context.parentURL.split('?')[0])
-
     return {
       format: 'ts',
       url,
@@ -151,7 +152,8 @@ export const resolve = async (specifier, context, nextResolve) => {
     host,
     moduleResolutionCache,
   )
-  // import from local project to local project TS file
+
+  // import between loacl projects
   if (
     resolvedModule
     && !resolvedModule.resolvedFileName.includes('/node_modules/')
@@ -184,7 +186,13 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
 
-  return nextResolve(specifier)
+  const resolveRet = await nextResolve(specifier)
+
+  // ts resolve fail in some cases
+  if (isAbsolute(resolveRet.url))
+    resolveRet.url = pathToFileURL(resolveRet.url).href
+
+  return resolveRet
 }
 // @todo the first params may be url or path, need to distinguish
 
@@ -271,7 +279,13 @@ export const load = async (url, context, nextLoad) => {
       return {
         format: 'module',
         source: (
-          await injectImports(compiled, (url.startsWith('file://') ? fileURLToPath(url) : url).replace(/\\/g, '/'))
+          await injectImports(
+            compiled,
+            (url.startsWith('file://') ? fileURLToPath(url) : url).replace(
+              /\\/g,
+              '/',
+            ),
+          )
         ).code,
         shortCircuit: true,
       }