phecda-server 4.0.6 → 4.0.7

package/dist/test.mjs

@@ -1,10 +1,9 @@
 import {
   Factory
-} from "./chunk-K32VRTXB.mjs";
+} from "./chunk-F5PQVQTY.mjs";
 import {
-  APP_SYMBOL,
   __name
-} from "./chunk-AYJWOIAW.mjs";
+} from "./chunk-DQUH5BP6.mjs";
 
 // src/test.ts
 async function TestFactory(...Modules) {
@@ -22,8 +21,7 @@ async function TestFactory(...Modules) {
   };
 }
 __name(TestFactory, "TestFactory");
-async function TestHttp(app, headers = {}) {
-  const { moduleMap, meta } = app[APP_SYMBOL];
+async function TestHttp(app, { moduleMap, meta }) {
   const { default: request } = await import("supertest");
   return {
     get(Module) {
@@ -34,11 +32,11 @@ async function TestHttp(app, headers = {}) {
       return new Proxy({}, {
         get(_target, p) {
           const { data } = meta.find(({ data: data2 }) => data2.name === Module.name && data2.method === p && data2.tag === tag);
-          return async (...args) => {
+          return (...args) => {
             const ret = {
               body: {},
               headers: {},
-              query: "",
+              query: {},
               method: data.http.type,
               url: data.http.route
             };
@@ -48,9 +46,7 @@ async function TestHttp(app, headers = {}) {
                 return;
               }
               if (item.type === "query") {
-                if (!ret.query)
-                  ret.query = "?";
-                ret.query += `${item.key}=${args[item.index]}`;
+                ret.query[item.key] = args[item.index];
                 return;
               }
               if (item.key)
@@ -58,14 +54,7 @@ async function TestHttp(app, headers = {}) {
               else
                 ret[item.type] = args[item.index];
             });
-            const res = await request(app)[ret.method](ret.url + ret.query).set({
-              ...headers,
-              ...ret.headers
-            }).send(ret.body);
-            if (res.type.includes("text"))
-              return res.text;
-            if (res.type.includes("json"))
-              return res.body;
+            return request(app)[ret.method](ret.url).query(ret.query).set(ret.headers).send(ret.body);
           };
         }
       });

package/dist/test.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/test.ts"],"sourcesContent":["import type { Router } from 'express'\nimport { Factory } from './core'\nimport type { Construct } from './types'\nimport { APP_SYMBOL } from './common'\n\nexport async function TestFactory<T extends Construct[]>(...Modules: T) {\n  const { moduleMap, constructorMap } = await Factory(Modules)\n\n  return {\n    get<C extends T[number]>(Module: C): InstanceType<C> {\n      const tag = Module.prototype?.__TAG__ || Module.name\n      const instance = moduleMap.get(tag)\n\n      if (!instance)\n        throw new Error(`module \"${tag}\" doesn't exist`)\n\n      if (constructorMap.get(tag) !== Module)\n        throw new Error(`Module ${Module.name} and \"${tag}' in modulemap are different modules`)\n\n      return instance\n    },\n  }\n}\n\nexport async function TestHttp(app: Router, headers: Record<string, string> = {}) {\n  const { moduleMap, meta } = (app as any)[APP_SYMBOL] as Awaited<ReturnType<typeof Factory>>\n  const { default: request } = await import('supertest')\n  return {\n    get<T extends Construct>(Module: T): InstanceType<T> {\n      const tag = Module.prototype?.__TAG__ || Module.name\n\n      const instance = moduleMap.get(tag)\n      if (!instance)\n        throw new Error(`module \"${tag}\" doesn't exist`)\n\n      return new Proxy({}, {\n        get(_target, p) {\n          const { data } = meta.find(({ data }) => data.name === Module.name && data.method === p && data.tag === tag)!\n          return async (...args: any) => {\n            const ret = { body: {}, headers: {}, query: '', method: data.http!.type, url: data.http!.route }\n\n            data.params.forEach((item) => {\n              if (item.type === 'params') {\n                ret.url = ret.url.replace(`:${item.key}`, args[item.index])\n                return\n              }\n              if (item.type === 'query') {\n                if (!ret.query)\n                  ret.query = '?'\n                ret.query += `${item.key}=${args[item.index]}`\n                return\n              }\n\n              // body\n              if (item.key)\n              // @ts-expect-error miss\n                ret[item.type][item.key] = args[item.index]\n              else\n              // @ts-expect-error miss\n                ret[item.type] = args[item.index]\n            })\n\n            const res = await request(app)[ret.method](ret.url + ret.query).set({ ...headers, ...ret.headers }).send(ret.body)\n            if (res.type.includes('text'))\n              return res.text\n\n            if (res.type.includes('json'))\n              return res.body\n          }\n        },\n      }) as any\n    },\n  }\n}\n"],"mappings":";;;;;;;;;AAKA,eAAsBA,eAAsCC,SAAY;AACtE,QAAM,EAAEC,WAAWC,eAAc,IAAK,MAAMC,QAAQH,OAAAA;AAEpD,SAAO;IACLI,IAAyBC,QAA4B;AACnD,YAAMC,MAAMD,OAAOE,WAAWC,WAAWH,OAAOI;AAChD,YAAMC,WAAWT,UAAUG,IAAIE,GAAAA;AAE/B,UAAI,CAACI;AACH,cAAM,IAAIC,MAAM,WAAWL,oBAAoB;AAEjD,UAAIJ,eAAeE,IAAIE,GAAAA,MAASD;AAC9B,cAAM,IAAIM,MAAM,UAAUN,OAAOI,aAAaH,yCAAyC;AAEzF,aAAOI;IACT;EACF;AACF;AAjBsBX;AAmBtB,eAAsBa,SAASC,KAAaC,UAAkC,CAAC,GAAG;AAChF,QAAM,EAAEb,WAAWc,KAAI,IAAMF,IAAYG;AACzC,QAAM,EAAEC,SAASC,QAAO,IAAK,MAAM,OAAO;AAC1C,SAAO;IACLd,IAAyBC,QAA4B;AACnD,YAAMC,MAAMD,OAAOE,WAAWC,WAAWH,OAAOI;AAEhD,YAAMC,WAAWT,UAAUG,IAAIE,GAAAA;AAC/B,UAAI,CAACI;AACH,cAAM,IAAIC,MAAM,WAAWL,oBAAoB;AAEjD,aAAO,IAAIa,MAAM,CAAC,GAAG;QACnBf,IAAIgB,SAASC,GAAG;AACd,gBAAM,EAAEC,KAAI,IAAKP,KAAKQ,KAAK,CAAC,EAAED,MAAAA,MAAI,MAAOA,MAAKb,SAASJ,OAAOI,QAAQa,MAAKE,WAAWH,KAAKC,MAAKhB,QAAQA,GAAAA;AACxG,iBAAO,UAAUmB,SAAc;AAC7B,kBAAMC,MAAM;cAAEC,MAAM,CAAC;cAAGb,SAAS,CAAC;cAAGc,OAAO;cAAIJ,QAAQF,KAAKO,KAAMC;cAAMC,KAAKT,KAAKO,KAAMG;YAAM;AAE/FV,iBAAKW,OAAOC,QAAQ,CAACC,SAAS;AAC5B,kBAAIA,KAAKL,SAAS,UAAU;AAC1BJ,oBAAIK,MAAML,IAAIK,IAAIK,QAAQ,IAAID,KAAKE,OAAOZ,KAAKU,KAAKG,MAAM;AAC1D;cACF;AACA,kBAAIH,KAAKL,SAAS,SAAS;AACzB,oBAAI,CAACJ,IAAIE;AACPF,sBAAIE,QAAQ;AACdF,oBAAIE,SAAS,GAAGO,KAAKE,OAAOZ,KAAKU,KAAKG;AACtC;cACF;AAGA,kBAAIH,KAAKE;AAEPX,oBAAIS,KAAKL,MAAMK,KAAKE,OAAOZ,KAAKU,KAAKG;;AAGrCZ,oBAAIS,KAAKL,QAAQL,KAAKU,KAAKG;YAC/B,CAAA;AAEA,kBAAMC,MAAM,MAAMrB,QAAQL,GAAAA,EAAKa,IAAIF,QAAQE,IAAIK,MAAML,IAAIE,KAAK,EAAEY,IAAI;cAAE,GAAG1B;cAAS,GAAGY,IAAIZ;YAAQ,CAAA,EAAG2B,KAAKf,IAAIC,IAAI;AACjH,gBAAIY,IAAIT,KAAKY,SAAS,MAAA;AACpB,qBAAOH,IAAII;AAEb,gBAAIJ,IAAIT,KAAKY,SAAS,MAAA;AACpB,qBAAOH,IAAIZ;UACf;QACF;MACF,CAAA;IACF;EACF;AACF;AAjDsBf;","names":["TestFactory","Modules","moduleMap","constructorMap","Factory","get","Module","tag","prototype","__TAG__","name","instance","Error","TestHttp","app","headers","meta","APP_SYMBOL","default","request","Proxy","_target","p","data","find","method","args","ret","body","query","http","type","url","route","params","forEach","item","replace","key","index","res","set","send","includes","text"]}
+{"version":3,"sources":["../src/test.ts"],"sourcesContent":["import type { Server } from 'node:http'\nimport type { Test } from 'supertest'\nimport { Factory } from './core'\nimport type { Construct, PickFunc } from './types'\n\nexport async function TestFactory<T extends Construct[]>(...Modules: T) {\n  const { moduleMap, constructorMap } = await Factory(Modules)\n\n  return {\n    get<C extends T[number]>(Module: C): InstanceType<C> {\n      const tag = Module.prototype?.__TAG__ || Module.name\n      const instance = moduleMap.get(tag)\n\n      if (!instance)\n        throw new Error(`module \"${tag}\" doesn't exist`)\n\n      if (constructorMap.get(tag) !== Module)\n        throw new Error(`Module ${Module.name} and \"${tag}' in modulemap are different modules`)\n\n      return instance\n    },\n  }\n}\n\nexport type SuperTestRequest<T> = {\n  [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;\n}\n\nexport async function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>) {\n  const { default: request } = await import('supertest')\n  return {\n    get<T extends Construct>(Module: T): SuperTestRequest<PickFunc<InstanceType<T>>> {\n      const tag = Module.prototype?.__TAG__ || Module.name\n\n      const instance = moduleMap.get(tag)\n      if (!instance)\n        throw new Error(`module \"${tag}\" doesn't exist`)\n\n      return new Proxy({}, {\n        get(_target, p) {\n          const { data } = meta.find(({ data }) => data.name === Module.name && data.method === p && data.tag === tag)!\n          return (...args: any) => {\n            const ret = { body: {}, headers: {}, query: {}, method: data.http!.type, url: data.http!.route } as any\n\n            data.params.forEach((item) => {\n              if (item.type === 'params') {\n                ret.url = ret.url.replace(`:${item.key}`, args[item.index])\n                return\n              }\n              if (item.type === 'query') {\n                ret.query[item.key] = args[item.index]\n                return\n              }\n\n              // body\n              if (item.key)\n                ret[item.type][item.key] = args[item.index]\n              else\n                ret[item.type] = args[item.index]\n            })\n\n            // @ts-expect-error miss type\n            return request(app)[ret.method](ret.url).query(ret.query).set(ret.headers).send(ret.body)\n          }\n        },\n      }) as any\n    },\n  }\n}\n"],"mappings":";;;;;;;;AAKA,eAAsBA,eAAsCC,SAAY;AACtE,QAAM,EAAEC,WAAWC,eAAc,IAAK,MAAMC,QAAQH,OAAAA;AAEpD,SAAO;IACLI,IAAyBC,QAA4B;AACnD,YAAMC,MAAMD,OAAOE,WAAWC,WAAWH,OAAOI;AAChD,YAAMC,WAAWT,UAAUG,IAAIE,GAAAA;AAE/B,UAAI,CAACI;AACH,cAAM,IAAIC,MAAM,WAAWL,oBAAoB;AAEjD,UAAIJ,eAAeE,IAAIE,GAAAA,MAASD;AAC9B,cAAM,IAAIM,MAAM,UAAUN,OAAOI,aAAaH,yCAAyC;AAEzF,aAAOI;IACT;EACF;AACF;AAjBsBX;AAuBtB,eAAsBa,SAASC,KAAmB,EAAEZ,WAAWa,KAAI,GAAyC;AAC1G,QAAM,EAAEC,SAASC,QAAO,IAAK,MAAM,OAAO;AAC1C,SAAO;IACLZ,IAAyBC,QAAwD;AAC/E,YAAMC,MAAMD,OAAOE,WAAWC,WAAWH,OAAOI;AAEhD,YAAMC,WAAWT,UAAUG,IAAIE,GAAAA;AAC/B,UAAI,CAACI;AACH,cAAM,IAAIC,MAAM,WAAWL,oBAAoB;AAEjD,aAAO,IAAIW,MAAM,CAAC,GAAG;QACnBb,IAAIc,SAASC,GAAG;AACd,gBAAM,EAAEC,KAAI,IAAKN,KAAKO,KAAK,CAAC,EAAED,MAAAA,MAAI,MAAOA,MAAKX,SAASJ,OAAOI,QAAQW,MAAKE,WAAWH,KAAKC,MAAKd,QAAQA,GAAAA;AACxG,iBAAO,IAAIiB,SAAc;AACvB,kBAAMC,MAAM;cAAEC,MAAM,CAAC;cAAGC,SAAS,CAAC;cAAGC,OAAO,CAAC;cAAGL,QAAQF,KAAKQ,KAAMC;cAAMC,KAAKV,KAAKQ,KAAMG;YAAM;AAE/FX,iBAAKY,OAAOC,QAAQ,CAACC,SAAS;AAC5B,kBAAIA,KAAKL,SAAS,UAAU;AAC1BL,oBAAIM,MAAMN,IAAIM,IAAIK,QAAQ,IAAID,KAAKE,OAAOb,KAAKW,KAAKG,MAAM;AAC1D;cACF;AACA,kBAAIH,KAAKL,SAAS,SAAS;AACzBL,oBAAIG,MAAMO,KAAKE,OAAOb,KAAKW,KAAKG;AAChC;cACF;AAGA,kBAAIH,KAAKE;AACPZ,oBAAIU,KAAKL,MAAMK,KAAKE,OAAOb,KAAKW,KAAKG;;AAErCb,oBAAIU,KAAKL,QAAQN,KAAKW,KAAKG;YAC/B,CAAA;AAGA,mBAAOrB,QAAQH,GAAAA,EAAKW,IAAIF,QAAQE,IAAIM,GAAG,EAAEH,MAAMH,IAAIG,KAAK,EAAEW,IAAId,IAAIE,OAAO,EAAEa,KAAKf,IAAIC,IAAI;UAC1F;QACF;MACF,CAAA;IACF;EACF;AACF;AAxCsBb;","names":["TestFactory","Modules","moduleMap","constructorMap","Factory","get","Module","tag","prototype","__TAG__","name","instance","Error","TestHttp","app","meta","default","request","Proxy","_target","p","data","find","method","args","ret","body","headers","query","http","type","url","route","params","forEach","item","replace","key","index","set","send"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "provide express middlewares, `nestjs` format",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -110,7 +110,7 @@
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "tree-kill": "^1.2.2",
-    "phecda-core": "2.1.0"
+    "phecda-core": "2.1.1"
   },
   "scripts": {
     "dev": "tsup --watch",

package/dist/chunk-AAF47ZC6.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/common.ts","../src/utils.ts"],"names":["MERGE_SYMBOL","UNMOUNT_SYMBOL","MODULE_SYMBOL","META_SYMBOL","APP_SYMBOL","IS_DEV","process","env","NODE_ENV","IS_STRICT","PS_STRICT","ERROR_SYMBOL","pc","time","log","msg","level","color","error","info","warn","date","Date","current","now","interval","console","magenta","gray","getHours","getMinutes","getSeconds"],"mappings":";;;;;;;;;AAAO,IAAMA,eAAe;AACrB,IAAMC,iBAAiB;AACvB,IAAMC,gBAAgB;AACtB,IAAMC,cAAc;AACpB,IAAMC,aAAa;AACnB,IAAMC,SAASC,QAAQC,IAAIC,aAAa;AACxC,IAAMC,YAAY,CAAC,CAACH,QAAQC,IAAIG;AAChC,IAAMC,eAAe;;;ACP5B,OAAOC,QAAQ;AAEf,IAAIC;AAEG,SAASC,IAAIC,KAAaC,QAAmC,QAAQ;AAC1E,QAAMC,QAAS;IAAEC,OAAO;IAAOC,MAAM;IAASC,MAAM;EAAS,EAAYJ;AACzE,QAAMK,OAAO,IAAIC,KAAAA;AACjB,QAAMC,UAAUD,KAAKE,IAAG;AACxB,QAAMC,WAAYZ,QAAQU,UAAUV,OAAQ,IAAIU,UAAUV,SAAS;AACnEA,SAAOU;AAEPG,UAAQZ,IAAI,GAAGF,GAAGe,QAAQ,iBAAA,KAAsBf,GAAGgB,KAAK,GAAGP,KAAKQ,SAAQ,KAAMR,KAAKS,WAAU,KAAMT,KAAKU,WAAU,GAAI,KAAKnB,GAAGK,OAAOF,GAAAA,KAAQH,GAAGgB,KAAKH,QAAAA,GAAW;AAClK;AARgBX","sourcesContent":["export const MERGE_SYMBOL = '__PS_MERGE__'\nexport const UNMOUNT_SYMBOL = '__PS_UNMOUNT__'\nexport const MODULE_SYMBOL = '__PS_MODULE__'\nexport const META_SYMBOL = '__PS_META__'\nexport const APP_SYMBOL = '__PS__'\nexport const IS_DEV = process.env.NODE_ENV === 'development'\nexport const IS_STRICT = !!process.env.PS_STRICT\nexport const ERROR_SYMBOL = '__PS_ERROR__'\n","import pc from 'picocolors'\n\nlet time: number\n\nexport function log(msg: string, level: 'error' | 'info' | 'warn' = 'info') {\n  const color = ({ error: 'red', info: 'green', warn: 'yellow' } as const)[level]\n  const date = new Date()\n  const current = Date.now()\n  const interval = (time && current - time) ? `+${current - time}` : ''\n  time = current\n  // eslint-disable-next-line no-console\n  console.log(`${pc.magenta('[phecda-server]')} ${pc.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${pc[color](msg)} ${pc.gray(interval)}`)\n}\n"]}

package/dist/chunk-AYJWOIAW.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/common.ts","../src/utils.ts"],"sourcesContent":["export const MERGE_SYMBOL = '__PS_MERGE__'\nexport const UNMOUNT_SYMBOL = '__PS_UNMOUNT__'\nexport const MODULE_SYMBOL = '__PS_MODULE__'\nexport const META_SYMBOL = '__PS_META__'\nexport const APP_SYMBOL = '__PS__'\nexport const IS_DEV = process.env.NODE_ENV === 'development'\nexport const IS_STRICT = !!process.env.PS_STRICT\nexport const ERROR_SYMBOL = '__PS_ERROR__'\n","import pc from 'picocolors'\n\nlet time: number\n\nexport function log(msg: string, level: 'error' | 'info' | 'warn' = 'info') {\n  const color = ({ error: 'red', info: 'green', warn: 'yellow' } as const)[level]\n  const date = new Date()\n  const current = Date.now()\n  const interval = (time && current - time) ? `+${current - time}` : ''\n  time = current\n  // eslint-disable-next-line no-console\n  console.log(`${pc.magenta('[phecda-server]')} ${pc.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${pc[color](msg)} ${pc.gray(interval)}`)\n}\n"],"mappings":";;;;;;;;;AAAO,IAAMA,eAAe;AACrB,IAAMC,iBAAiB;AACvB,IAAMC,gBAAgB;AACtB,IAAMC,cAAc;AACpB,IAAMC,aAAa;AACnB,IAAMC,SAASC,QAAQC,IAAIC,aAAa;AACxC,IAAMC,YAAY,CAAC,CAACH,QAAQC,IAAIG;AAChC,IAAMC,eAAe;;;ACP5B,OAAOC,QAAQ;AAEf,IAAIC;AAEG,SAASC,IAAIC,KAAaC,QAAmC,QAAQ;AAC1E,QAAMC,QAAS;IAAEC,OAAO;IAAOC,MAAM;IAASC,MAAM;EAAS,EAAYJ;AACzE,QAAMK,OAAO,IAAIC,KAAAA;AACjB,QAAMC,UAAUD,KAAKE,IAAG;AACxB,QAAMC,WAAYZ,QAAQU,UAAUV,OAAQ,IAAIU,UAAUV,SAAS;AACnEA,SAAOU;AAEPG,UAAQZ,IAAI,GAAGa,GAAGC,QAAQ,iBAAA,KAAsBD,GAAGE,KAAK,GAAGR,KAAKS,SAAQ,KAAMT,KAAKU,WAAU,KAAMV,KAAKW,WAAU,GAAI,KAAKL,GAAGV,OAAOF,GAAAA,KAAQY,GAAGE,KAAKJ,QAAAA,GAAW;AAClK;AARgBX;","names":["MERGE_SYMBOL","UNMOUNT_SYMBOL","MODULE_SYMBOL","META_SYMBOL","APP_SYMBOL","IS_DEV","process","env","NODE_ENV","IS_STRICT","PS_STRICT","ERROR_SYMBOL","pc","time","log","msg","level","color","error","info","warn","date","Date","current","now","interval","console","pc","magenta","gray","getHours","getMinutes","getSeconds"]}

package/dist/core-c27b4cf4.d.ts

@@ -1,23 +0,0 @@
-import { P, a as Emitter, C as Construct } from './types-8415bd5d.js';
-
-declare class Meta {
-    data: P.Meta;
-    handlers: P.Handler[];
-    paramsType: any[];
-    constructor(data: P.Meta, handlers: P.Handler[], paramsType: any[]);
-}
-
-declare function Injectable(): (target: any) => void;
-declare const emitter: Emitter;
-declare function Factory(Modules: (new (...args: any) => any)[], opts?: {
-    http?: string;
-    rpc?: string;
-}): Promise<{
-    moduleMap: Map<string, any>;
-    meta: Meta[];
-    constructorMap: Map<any, any>;
-    add: (Module: Construct) => Promise<void>;
-    del: (tag: string) => Promise<any>;
-}>;
-
-export { Factory as F, Injectable as I, Meta as M, emitter as e };