phecda-server 5.0.0-alpha.8 → 5.0.0-beta.19

package/bin/cli.js

@@ -10,15 +10,21 @@ let child
 let closePromise
 const nodeVersion = parseFloat(process.version.slice(1))
 
-if (nodeVersion < 18.18)
-  log(`Nodejs version less than 18.18(current is ${nodeVersion}) can't support hmr`, 'yellow')
+if (nodeVersion < 18.18) {
+  log(
+    `Nodejs version less than 18.18(current is ${nodeVersion}) can't support hmr`,
+    'yellow',
+  )
+}
 
 function startChild() {
   child = fork(cmd[0], {
     env: { NODE_ENV: 'development', ...process.env },
     stdio: 'inherit',
     execArgv: [
-      nodeVersion < 18.18 ? '--loader=phecda-server/register/loader.mjs' : '--import=phecda-server/register',
+      nodeVersion < 18.18
+        ? '--loader=phecda-server/register/loader.mjs'
+        : '--import=phecda-server/register',
       ...cmd.slice(1),
     ],
   })
@@ -61,51 +67,77 @@ function log(msg, color = 'green') {
     )} ${pc[color](msg)}`,
   )
 }
+if (cmd[0] === 'init') {
+  fs.writeFileSync('tsconfig.json', `{
+    "compilerOptions": {
+      "target": "esnext",
+      "useDefineForClassFields": false,
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true,
+      "module": "esnext",
+      "lib": ["esnext", "DOM"],
+      "strictPropertyInitialization": false,
+      "moduleResolution": "Node",
+      "strict": true,
+      "resolveJsonModule": true,
+      "isolatedModules": true,
+      "esModuleInterop": true,
+      "noEmit": true,
+      "noUnusedLocals": true,
+      "noUnusedParameters": true,
+      "noImplicitReturns": true,
+      "skipLibCheck": true
+    },
+    "include": ["src","./ps.d.ts"]
+  }
+  `)
 
-startChild()
-
-log('process start!')
-console.log(`${pc.green('->')} press ${pc.green('e')} to exit`)
-console.log(`${pc.green('->')} press ${pc.green('r')} to relaunch`)
-console.log(
+  log('init tsconfig.json!')
+}
+else {
+  startChild()
+  log('process start!')
+  console.log(`${pc.green('->')} press ${pc.green('e')} to exit`)
+  console.log(`${pc.green('->')} press ${pc.green('r')} to relaunch`)
+  console.log(
   `${pc.green('->')} press ${pc.green(
     'c {moduleName} {dir}',
   )} to create controller`,
-)
-console.log(
+  )
+  console.log(
   `${pc.green('->')} press ${pc.green(
     's {moduleName} {dir}',
   )} to create service`,
-)
-console.log(
+  )
+  console.log(
   `${pc.green('->')} press ${pc.green('m {moduleName} {dir}')} to create module`,
-)
-
-process.stdin.on('data', async (data) => {
-  const input = data.toString().trim().toLocaleLowerCase()
-  if (input === 'r') {
-    if (child) {
-      await child.kill()
-      if (closePromise)
-        await closePromise
-      log('relaunch...')
-      startChild()
-    }
-    else {
-      log('relaunch...')
+  )
 
-      startChild()
+  process.stdin.on('data', async (data) => {
+    const input = data.toString().trim().toLocaleLowerCase()
+    if (input === 'r') {
+      if (child) {
+        await child.kill()
+        if (closePromise)
+          await closePromise
+        log('relaunch...')
+        startChild()
+      }
+      else {
+        log('relaunch...')
+
+        startChild()
+      }
     }
-  }
-  if (input === 'e')
-    exit()
-
-  if (input.startsWith('c ')) {
-    let [, module, dir] = input.split(' ')
-    module = toCamelCase(module)
-    const path = posix.join(dir, `${module}.controller.ts`)
-    fs.writeFile(
-      path,
+    if (input === 'e')
+      exit()
+
+    if (input.startsWith('c ')) {
+      let [, module, dir] = input.split(' ')
+      module = toCamelCase(module)
+      const path = posix.join(dir, `${module}.controller.ts`)
+      fs.writeFile(
+        path,
       `
     export class ${module[0].toUpperCase()}${module.slice(1)}Controller{
       
@@ -116,14 +148,14 @@ process.stdin.on('data', async (data) => {
           log('writeFile filled', 'red')
         else log(`create controller at ${path}`)
       },
-    )
-  }
-  if (input.startsWith('s ')) {
-    let [, module, dir] = input.split(' ')
-    module = toCamelCase(module)
-    const path = posix.join(dir, `${module}.service.ts`)
-    fs.writeFile(
-      path,
+      )
+    }
+    if (input.startsWith('s ')) {
+      let [, module, dir] = input.split(' ')
+      module = toCamelCase(module)
+      const path = posix.join(dir, `${module}.service.ts`)
+      fs.writeFile(
+        path,
       `
     import {Tag} from 'phecda-server'
     @Tag('${module}')
@@ -136,15 +168,15 @@ process.stdin.on('data', async (data) => {
           log('writeFile filled', 'red')
         else log(`create service at ${path}`)
       },
-    )
-  }
+      )
+    }
 
-  if (input.startsWith('m ')) {
-    let [, module, dir] = input.split(' ')
-    module = toCamelCase(module)
-    const path = posix.join(dir, `${module}.module.ts`)
-    fs.writeFile(
-      path,
+    if (input.startsWith('m ')) {
+      let [, module, dir] = input.split(' ')
+      module = toCamelCase(module)
+      const path = posix.join(dir, `${module}.module.ts`)
+      fs.writeFile(
+        path,
       `
     import {Tag} from 'phecda-server'
     @Tag('${module}')
@@ -157,9 +189,10 @@ process.stdin.on('data', async (data) => {
           log('writeFile filled', 'red')
         else log(`create module at ${path}`)
       },
-    )
-  }
-})
+      )
+    }
+  })
+}
 
 function toCamelCase(str) {
   return str.replace(/[-_]\w/g, match => match.charAt(1).toUpperCase())

package/dist/{chunk-GY5KXMJJ.js → chunk-EVF2CXTP.js}

@@ -1,15 +1,32 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkALJSRZ4Zjs = require('./chunk-ALJSRZ4Z.js');
+var _chunkXHKBG2VAjs = require('./chunk-XHKBG2VA.js');
 
-// src/helper.ts
+// src/server/helper.ts
 function resolveDep(ret, key) {
   if (key)
     return _optionalChain([ret, 'optionalAccess', _ => _[key]]);
   return ret;
 }
-_chunkALJSRZ4Zjs.__name.call(void 0, resolveDep, "resolveDep");
+_chunkXHKBG2VAjs.__name.call(void 0, resolveDep, "resolveDep");
+function argToReq(params, args, headers) {
+  const req = {
+    body: {},
+    query: {},
+    params: {},
+    headers
+  };
+  params.forEach((param) => {
+    if (param.key)
+      req[param.type][param.key] = args[param.index];
+    else
+      req[param.type] = args[param.index];
+  });
+  return req;
+}
+_chunkXHKBG2VAjs.__name.call(void 0, argToReq, "argToReq");
+
 
 
 
-exports.resolveDep = resolveDep;
+exports.resolveDep = resolveDep; exports.argToReq = argToReq;

package/dist/{chunk-65S2TIDV.mjs → chunk-LSMNOIFA.mjs}

@@ -1,18 +1,15 @@
 import {
   IS_DEV,
-  UNMOUNT_SYMBOL,
   __name,
   log
-} from "./chunk-WB437JJ2.mjs";
+} from "./chunk-UFSW7A6B.mjs";
 
 // src/meta.ts
 var Meta = class {
   data;
-  handlers;
   paramsType;
-  constructor(data, handlers, paramsType) {
+  constructor(data, paramsType) {
     this.data = data;
-    this.handlers = handlers;
     this.paramsType = paramsType;
   }
 };
@@ -103,7 +100,7 @@ __name(generateHTTPCode, "generateHTTPCode");
 import "reflect-metadata";
 import fs from "fs";
 import EventEmitter from "node:events";
-import { Empty, SHARE_KEY, getExposeKey, getHandler, getProperty, getState, injectProperty, isPhecda, registerAsync } from "phecda-core";
+import { Empty, SHARE_KEY, getExposeKey, getKey, getState, getTag, injectKey, invokeHandler, isPhecda } from "phecda-core";
 import Debug from "debug";
 function Injectable() {
   return (target) => Empty(target);
@@ -118,30 +115,25 @@ async function Factory(Modules, opts = {}) {
   const constructorSet = /* @__PURE__ */ new WeakSet();
   const moduleGraph = /* @__PURE__ */ new Map();
   const { http, rpc } = opts;
-  if (!getProperty("watcher")) {
-    injectProperty("watcher", ({ eventName, instance, key, options }) => {
+  if (!getKey("watcher")) {
+    injectKey("watcher", ({ eventName, instance, key, options }) => {
       const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-      if (!instance[UNMOUNT_SYMBOL])
-        instance[UNMOUNT_SYMBOL] = [];
-      instance[UNMOUNT_SYMBOL].push(() => {
-        emitter.off(eventName, fn);
-      });
       if (options?.once)
         emitter.once(eventName, fn);
       else
         emitter.on(eventName, fn);
+      return () => {
+        emitter.off(eventName, fn);
+      };
     });
   }
   async function del(tag) {
     if (!moduleMap.has(tag))
       return;
     const instance = moduleMap.get(tag);
-    debug(`unmount module "${tag}"`);
-    if (instance?.[UNMOUNT_SYMBOL]) {
-      for (const cb of instance[UNMOUNT_SYMBOL])
-        await cb();
-    }
-    debug(`del module "${tag}"`);
+    debug(`unmount module "${String(tag)}"`);
+    invokeHandler("unmount", instance);
+    debug(`del module "${String(tag)}"`);
     moduleMap.delete(tag);
     constructorMap.delete(tag);
     for (let i = meta.length - 1; i >= 0; i--) {
@@ -151,12 +143,18 @@ async function Factory(Modules, opts = {}) {
     return instance;
   }
   __name(del, "del");
+  async function destroy() {
+    debug("destroy all");
+    for (const [tag] of moduleMap)
+      await del(tag);
+  }
+  __name(destroy, "destroy");
   async function add(Module) {
-    const tag = Module.prototype?.__TAG__ || Module.name;
+    const tag = getTag(Module);
     const oldInstance = await del(tag);
     const { instance: newModule } = await buildNestModule(Module);
     if (oldInstance && moduleGraph.has(tag)) {
-      debug(`replace module "${tag}"`);
+      debug(`replace module "${String(tag)}"`);
       [
         ...moduleGraph.get(tag)
       ].forEach((tag2) => {
@@ -172,14 +170,14 @@ async function Factory(Modules, opts = {}) {
   async function buildNestModule(Module) {
     const paramtypes = getParamTypes(Module);
     let instance;
-    const tag = Module.prototype?.__TAG__ || Module.name;
+    const tag = getTag(Module);
     if (moduleMap.has(tag)) {
       instance = moduleMap.get(tag);
       if (!instance)
-        throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${tag}--[module] ${Module}`);
+        throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${String(tag)}--[module] ${Module}`);
       if (constructorMap.get(tag) !== Module && !constructorSet.has(Module)) {
         constructorSet.add(Module);
-        log(`Synonym module: Module taged "${tag}" has been loaded before, so phecda-server won't load Module "${Module.name}"`, "warn");
+        log(`Synonym module: Module taged "${String(tag)}" has been loaded before, so phecda-server won't load Module "${Module.name}"`, "warn");
       }
       return {
         instance,
@@ -187,7 +185,7 @@ async function Factory(Modules, opts = {}) {
       };
     }
     moduleMap.set(tag, void 0);
-    debug(`instantiate module "${tag}"`);
+    debug(`instantiate module "${String(tag)}"`);
     if (paramtypes) {
       const paramtypesInstances = [];
       for (const i in paramtypes) {
@@ -202,9 +200,9 @@ async function Factory(Modules, opts = {}) {
       instance = new Module();
     }
     meta.push(...getMetaFromInstance(instance, tag, Module.name));
-    debug(`init module "${tag}"`);
-    await registerAsync(instance);
-    debug(`add module "${tag}"`);
+    debug(`init module "${String(tag)}"`);
+    await invokeHandler("init", instance);
+    debug(`add module "${String(tag)}"`);
     moduleMap.set(tag, instance);
     constructorMap.set(tag, Module);
     return {
@@ -247,7 +245,8 @@ async function Factory(Modules, opts = {}) {
     meta,
     constructorMap,
     add,
-    del
+    del,
+    destroy
   };
 }
 __name(Factory, "Factory");
@@ -273,6 +272,8 @@ function getMetaFromInstance(instance, tag, name) {
         ...state.rpc
       };
     }
+    if (typeof tag !== "string" && (meta.rpc || meta.http))
+      log(`can't use Tag with ${typeof tag} on http/rpc controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
     meta.name = name;
     meta.tag = tag;
     meta.method = i;
@@ -310,7 +311,7 @@ function getMetaFromInstance(instance, tag, name) {
         ...state.interceptors
       ])
     ];
-    return new Meta(meta, getHandler(instance, i), getParamTypes(instance, i) || []);
+    return new Meta(meta, getParamTypes(instance, i) || []);
   });
 }
 __name(getMetaFromInstance, "getMetaFromInstance");

package/dist/chunk-N7GEBDPZ.mjs

@@ -0,0 +1,32 @@
+import {
+  __name
+} from "./chunk-UFSW7A6B.mjs";
+
+// src/server/helper.ts
+function resolveDep(ret, key) {
+  if (key)
+    return ret?.[key];
+  return ret;
+}
+__name(resolveDep, "resolveDep");
+function argToReq(params, args, headers) {
+  const req = {
+    body: {},
+    query: {},
+    params: {},
+    headers
+  };
+  params.forEach((param) => {
+    if (param.key)
+      req[param.type][param.key] = args[param.index];
+    else
+      req[param.type] = args[param.index];
+  });
+  return req;
+}
+__name(argToReq, "argToReq");
+
+export {
+  resolveDep,
+  argToReq
+};

package/dist/{chunk-DBYLTVRY.mjs → chunk-PXI5J4LR.mjs}

@@ -1,11 +1,12 @@
 import {
   ERROR_SYMBOL,
   IS_DEV,
+  IS_LOG_BAN,
   IS_STRICT,
   __name,
   __publicField,
   log
-} from "./chunk-WB437JJ2.mjs";
+} from "./chunk-UFSW7A6B.mjs";
 
 // src/exception/base.ts
 var Exception = class extends Error {
@@ -38,11 +39,11 @@ var ValidateException = class extends Exception {
 __name(ValidateException, "ValidateException");
 
 // src/pipe.ts
-import { isPhecda, plainToClass, transformClass } from "phecda-core";
-var defaultPipe = /* @__PURE__ */ __name(async ({ arg, reflect, index }) => {
+import { isPhecda, plainToClass, transformInstance } from "phecda-core";
+var defaultPipe = /* @__PURE__ */ __name(({ arg, reflect, index }) => {
   if (isPhecda(reflect)) {
     const instance = plainToClass(reflect, arg);
-    const err = await transformClass(instance);
+    const err = transformInstance(instance);
     if (err.length > 0)
       throw new ValidateException(err[0]);
     arg = instance;
@@ -169,16 +170,14 @@ import pc from "picocolors";
 // src/filter.ts
 var defaultFilter = /* @__PURE__ */ __name((e) => {
   if (!(e instanceof Exception)) {
-    if (IS_DEV) {
-      log(e.message, "error");
+    log(e.message, "error");
+    if (!IS_LOG_BAN)
       console.error(e.stack);
-    }
     e = new UndefinedException(e.message || e);
   } else {
-    if (IS_DEV) {
-      log(`[${e.constructor.name}] ${e.message}`, "error");
+    log(`[${e.constructor.name}] ${e.message}`, "error");
+    if (!IS_LOG_BAN)
       console.error(e.stack);
-    }
   }
   return e.data;
 }, "defaultFilter");
@@ -294,28 +293,36 @@ __publicField(Context, "guardRecord", {});
 __publicField(Context, "interceptorRecord", {});
 __publicField(Context, "pluginRecord", {});
 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, pipe) {
-  Context.pipeRecord[key] = pipe;
+function addPipe(key, handler) {
+  if (Context.pipeRecord[key] && Context.pipeRecord[key] !== handler)
+    log(`overwrite Pipe "${String(key)}"`, "warn");
+  Context.pipeRecord[key] = handler;
 }
 __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;
 }
 __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;
 }
 __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;
 }
 __name(addInterceptor, "addInterceptor");
 function isAopDepInject(meta, { guards, interceptors, plugins } = {}) {
-  if (!IS_DEV)
-    return;
   const pluginSet = new Set(plugins);
   const guardSet = new Set(guards);
   const interceptorSet = new Set(interceptors);

package/dist/{chunk-WB437JJ2.mjs → chunk-UFSW7A6B.mjs}

@@ -14,15 +14,18 @@ var META_SYMBOL = "__PS_META__";
 var APP_SYMBOL = "__PS__";
 var IS_DEV = process.env.NODE_ENV === "development";
 var IS_STRICT = !!process.env.PS_STRICT;
+var IS_LOG_BAN = !!process.env.PS_LOG_BAN;
 var ERROR_SYMBOL = "__PS_ERROR__";
-var PS_FILE_RE = /\.(controller|service|module|extension|guard|interceptor|plugin|filter|pipe|edge)\.ts$/i;
-var PS_IMPORT_RE = /\.(controller|extension|guard|interceptor|plugin|filter|pipe|edge)\.ts$/i;
+var PS_FILE_RE = /\.(controller|service|module|extension|ext|guard|interceptor|plugin|filter|pipe|edge)\.ts$/i;
+var PS_IMPORT_RE = /\.(controller|extension|ext|guard|interceptor|plugin|filter|pipe|edge)\.ts$/i;
 
 // src/utils.ts
 import pc from "picocolors";
 import { DataMap } from "phecda-core";
 var time;
 function log(msg, level = "info") {
+  if (IS_LOG_BAN)
+    return;
   const color = {
     error: "red",
     info: "green",
@@ -50,6 +53,15 @@ function setConfig(key, conf, force = true) {
   DataMap[key] = conf;
 }
 __name(setConfig, "setConfig");
+function Mix(InternalClass, ExtendClass) {
+  return class extends InternalClass {
+    constructor(...args) {
+      super();
+      Object.assign(this, new ExtendClass(...args));
+    }
+  };
+}
+__name(Mix, "Mix");
 
 export {
   __name,
@@ -61,10 +73,12 @@ export {
   APP_SYMBOL,
   IS_DEV,
   IS_STRICT,
+  IS_LOG_BAN,
   ERROR_SYMBOL,
   PS_FILE_RE,
   PS_IMPORT_RE,
   log,
   getConfig,
-  setConfig
+  setConfig,
+  Mix
 };