phecda-server 7.1.3 → 8.0.0

package/assets/schema.json

@@ -51,6 +51,11 @@
           "description": "Disable unimport"
         }
       ]
+    },
+    "swc": {
+      "type": "object",
+      "description": "options passed to @swc-node/core"
+      
     }
   },
 

package/dist/{chunk-MKRHYZCL.mjs → chunk-FI5756JX.mjs}

@@ -104,12 +104,12 @@ __name(Pipe, "Pipe");
 
 // src/decorators/http.ts
 import { setMeta as setMeta3 } from "phecda-core";
-function Route(route, type) {
+function Route(route, method) {
   return (target, property) => {
     setMeta3(target, property, void 0, {
       http: {
         route,
-        type
+        method
       }
     });
   };

package/dist/{chunk-JTSD2LIG.js → chunk-OLNN4U3O.js}

@@ -13,14 +13,17 @@ var Meta = class {
   }
   
   
-  constructor(data, paramsType) {
+  
+  
+  constructor(data, paramsType, module, model) {
     this.data = data;
     this.paramsType = paramsType;
+    this.module = module;
+    this.model = model;
   }
 };
 
 // src/core.ts
-require('reflect-metadata');
 var _events = require('events'); var _events2 = _interopRequireDefault(_events);
 var _phecdacore = require('phecda-core');
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
@@ -149,7 +152,7 @@ var ServerPhecda = (_class = class {
     } else {
       module = this.parseModule(new Model());
     }
-    this.meta.push(...getMetaFromInstance(module, tag, Model.name).map(this.parseMeta).filter((item) => !!item));
+    this.meta.push(...getMetaFromInstance(module, tag, Model).map(this.parseMeta).filter((item) => !!item));
     debug(`init module "${String(tag)}"`);
     if (!_chunk4LLLQOMFjs.IS_ONLY_GENERATE) await _phecdacore.invokeInit.call(void 0, module);
     debug(`add module "${String(tag)}"`);
@@ -227,7 +230,8 @@ function useS(nsOrModel, namespace) {
   else return serverPhecda;
 }
 _chunk4LLLQOMFjs.__name.call(void 0, useS, "useS");
-function getMetaFromInstance(instance, tag, name) {
+function getMetaFromInstance(instance, tag, model) {
+  const name = model.name;
   const propertyKeys = _phecdacore.getMetaKey.call(void 0, instance).filter((item) => typeof item === "string");
   const baseMeta = _phecdacore.getMergedMeta.call(void 0, instance, void 0);
   const ctxs = baseMeta.ctxs;
@@ -237,7 +241,7 @@ function getMetaFromInstance(instance, tag, name) {
       ...meta,
       name,
       tag,
-      func: i
+      method: i
     };
     if (baseMeta.controller) {
       if (typeof tag !== "string") _chunk4LLLQOMFjs.log.call(void 0, `can't use Tag with ${typeof tag} on controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
@@ -247,7 +251,7 @@ function getMetaFromInstance(instance, tag, name) {
         ...meta[baseMeta.controller]
       };
       const params = _phecdacore.getMetaParams.call(void 0, instance, i).map((item) => _phecdacore.getMergedMeta.call(void 0, instance, i, item));
-      metaData.rawMeta = meta;
+      metaData.meta = meta;
       metaData.ctxs = ctxs;
       metaData.params = params.map((item, index) => {
         return {
@@ -255,7 +259,7 @@ function getMetaFromInstance(instance, tag, name) {
           pipe: item.pipe || meta.pipe || baseMeta.pipe,
           define: item.define || {},
           index,
-          rawMeta: item
+          meta: item
         };
       });
       metaData.filter = meta.filter || baseMeta.filter;
@@ -279,7 +283,7 @@ function getMetaFromInstance(instance, tag, name) {
         ];
       }
     }
-    return new Meta(deepFreeze(metaData), getParamTypes(instance, i) || []);
+    return new Meta(deepFreeze(metaData), getParamTypes(instance, i) || [], instance, model);
   });
 }
 _chunk4LLLQOMFjs.__name.call(void 0, getMetaFromInstance, "getMetaFromInstance");
@@ -292,9 +296,7 @@ function deepFreeze(object) {
 }
 _chunk4LLLQOMFjs.__name.call(void 0, deepFreeze, "deepFreeze");
 function getParamTypes(Model, key) {
-  const paramTypes = Reflect.getMetadata("design:paramtypes", Model, key);
-  if (typeof paramTypes === "function") return paramTypes();
-  else return paramTypes;
+  return Reflect.getMetadata("design:paramtypes", Model, key);
 }
 _chunk4LLLQOMFjs.__name.call(void 0, getParamTypes, "getParamTypes");
 

package/dist/{chunk-TQSHE4PZ.mjs → chunk-PFPOEZHH.mjs}

@@ -13,14 +13,17 @@ var Meta = class {
   }
   data;
   paramsType;
-  constructor(data, paramsType) {
+  module;
+  model;
+  constructor(data, paramsType, module, model) {
     this.data = data;
     this.paramsType = paramsType;
+    this.module = module;
+    this.model = model;
   }
 };
 
 // src/core.ts
-import "reflect-metadata";
 import EventEmitter from "events";
 import { getInject, getMergedMeta, getMetaKey, getMetaParams, getTag, invokeInit, invokeUnmount, setInject } from "phecda-core";
 import Debug from "debug";
@@ -149,7 +152,7 @@ var ServerPhecda = class {
     } else {
       module = this.parseModule(new Model());
     }
-    this.meta.push(...getMetaFromInstance(module, tag, Model.name).map(this.parseMeta).filter((item) => !!item));
+    this.meta.push(...getMetaFromInstance(module, tag, Model).map(this.parseMeta).filter((item) => !!item));
     debug(`init module "${String(tag)}"`);
     if (!IS_ONLY_GENERATE) await invokeInit(module);
     debug(`add module "${String(tag)}"`);
@@ -227,7 +230,8 @@ function useS(nsOrModel, namespace) {
   else return serverPhecda;
 }
 __name(useS, "useS");
-function getMetaFromInstance(instance, tag, name) {
+function getMetaFromInstance(instance, tag, model) {
+  const name = model.name;
   const propertyKeys = getMetaKey(instance).filter((item) => typeof item === "string");
   const baseMeta = getMergedMeta(instance, void 0);
   const ctxs = baseMeta.ctxs;
@@ -237,7 +241,7 @@ function getMetaFromInstance(instance, tag, name) {
       ...meta,
       name,
       tag,
-      func: i
+      method: i
     };
     if (baseMeta.controller) {
       if (typeof tag !== "string") log(`can't use Tag with ${typeof tag} on controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
@@ -247,7 +251,7 @@ function getMetaFromInstance(instance, tag, name) {
         ...meta[baseMeta.controller]
       };
       const params = getMetaParams(instance, i).map((item) => getMergedMeta(instance, i, item));
-      metaData.rawMeta = meta;
+      metaData.meta = meta;
       metaData.ctxs = ctxs;
       metaData.params = params.map((item, index) => {
         return {
@@ -255,7 +259,7 @@ function getMetaFromInstance(instance, tag, name) {
           pipe: item.pipe || meta.pipe || baseMeta.pipe,
           define: item.define || {},
           index,
-          rawMeta: item
+          meta: item
         };
       });
       metaData.filter = meta.filter || baseMeta.filter;
@@ -279,7 +283,7 @@ function getMetaFromInstance(instance, tag, name) {
         ];
       }
     }
-    return new Meta(deepFreeze(metaData), getParamTypes(instance, i) || []);
+    return new Meta(deepFreeze(metaData), getParamTypes(instance, i) || [], instance, model);
   });
 }
 __name(getMetaFromInstance, "getMetaFromInstance");
@@ -292,9 +296,7 @@ function deepFreeze(object) {
 }
 __name(deepFreeze, "deepFreeze");
 function getParamTypes(Model, key) {
-  const paramTypes = Reflect.getMetadata("design:paramtypes", Model, key);
-  if (typeof paramTypes === "function") return paramTypes();
-  else return paramTypes;
+  return Reflect.getMetadata("design:paramtypes", Model, key);
 }
 __name(getParamTypes, "getParamTypes");
 

package/dist/{chunk-DPPDWBYO.js → chunk-UYZSUBX4.js}

@@ -104,12 +104,12 @@ _chunk4LLLQOMFjs.__name.call(void 0, Pipe, "Pipe");
 
 // src/decorators/http.ts
 
-function Route(route, type) {
+function Route(route, method) {
   return (target, property) => {
     _phecdacore.setMeta.call(void 0, target, property, void 0, {
       http: {
         route,
-        type
+        method
       }
     });
   };

package/dist/{chunk-P3CS65OP.mjs → chunk-VAHCYYCB.mjs}

@@ -16,6 +16,9 @@ import pc2 from "picocolors";
 import Debug from "debug";
 import pc from "picocolors";
 
+// src/pipe.ts
+import { isPhecda, validate } from "phecda-core";
+
 // src/exception/base.ts
 var Exception = class extends Error {
   static {
@@ -198,21 +201,33 @@ var WorkerException = class extends Exception {
 };
 
 // src/pipe.ts
-var defaultPipe = /* @__PURE__ */ __name(async ({ arg, reflect, rawMeta, index }) => {
-  if (arg !== void 0 && [
+var defaultPipe = /* @__PURE__ */ __name(async ({ arg, reflect, meta, index }, { method }) => {
+  if (arg === void 0) {
+    if (meta.required === false) return arg;
+    else throw new ValidateException(`param ${index + 1} is required`);
+  }
+  if ([
     Number,
     Boolean,
     String
   ].includes(reflect)) arg = reflect(arg);
-  if (rawMeta.required && arg === void 0) throw new ValidateException(`param ${index} is required`);
-  if (rawMeta.rules) {
-    for (const rule of rawMeta.rules) {
-      let res = rule(arg);
-      if (res instanceof Promise) res = await res;
-      if (typeof res === "string") throw new ValidateException(res);
-      if (res === false) throw new ValidateException(`validation failed for param ${index}`);
+  if (reflect === Number && isNaN(arg)) throw new ValidateException(`param ${index + 1} is not a number`);
+  if (meta.rules) {
+    for (const rule of meta.rules) {
+      const err = await rule({
+        value: arg,
+        property: method,
+        meta,
+        model: reflect,
+        index
+      });
+      if (err.length > 0) throw new ValidateException(err[0]);
     }
   }
+  if (isPhecda(reflect)) {
+    const errs = await validate(reflect, arg);
+    if (errs.length) throw new ValidateException(errs[0]);
+  }
   return arg;
 }, "defaultPipe");
 
@@ -265,7 +280,7 @@ var Context = class _Context {
   }
   static getAop(meta, opts) {
     const { globalGuards = [], globalFilter = "default", globalPipe = "default" } = opts;
-    const { data: { guards, filter, params, tag, func } } = meta;
+    const { data: { guards, filter, params, tag, method } } = meta;
     const resolved = {
       guards: [
         ...globalGuards,
@@ -276,7 +291,7 @@ var Context = class _Context {
     };
     if (process.env.DEBUG) {
       const { guards: guards2, pipe, filter: filter2 } = resolved;
-      debug(`func "${tag}-${func}" aop: 
+      debug(`method "${tag}-${method}" aop: 
 ${pc.magenta(`Guard ${guards2.join("->")}[${guards2.filter((g) => g in this.guardRecord).join("->")}]`)}
 ${pc.blue(`Pipe ${pipe.join("-")}[${pipe.map((p) => p in this.pipeRecord ? p : "default").join("-")}]`)}
 ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
@@ -289,7 +304,7 @@ ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
   }
   async run({ guards, filter, pipe }, successCb, failCb) {
     const { meta, moduleMap } = this.data;
-    const { paramsType, data: { ctxs, tag, params, func } } = meta;
+    const { paramsType, data: { ctxs, tag, params, method } } = meta;
     try {
       let res;
       const nextHandler = /* @__PURE__ */ __name((index) => {
@@ -304,13 +319,13 @@ ${pc.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
               reflect: paramsType[item.index],
               ...item
             }, this.ctx)));
-            res = await instance[func](...args);
+            res = await instance[method](...args);
           } else {
             let nextPromise;
             async function next() {
               return nextPromise = nextHandler(index + 1)().then((ret2) => {
                 if (ret2 !== void 0) {
-                  debug(`The ${index + 1}th guard on "${tag}-${func}" rewrite the response value.`);
+                  debug(`The ${index + 1}th guard on "${tag}-${method}" rewrite the response value.`);
                   res = ret2;
                 }
                 return res;
@@ -409,11 +424,11 @@ function createControllerMetaMap(meta, filter) {
   function handleMeta() {
     metaMap.clear();
     for (const item of meta) {
-      const { tag, func } = item.data;
+      const { tag, method } = item.data;
       if (!filter(item)) continue;
-      if (metaMap.has(tag)) metaMap.get(tag)[func] = item;
+      if (metaMap.has(tag)) metaMap.get(tag)[method] = item;
       else metaMap.set(tag, {
-        [func]: item
+        [method]: item
       });
     }
   }

package/dist/{chunk-OV3UJLGP.js → chunk-YJ3QHGTC.js}

@@ -16,6 +16,9 @@ var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefau
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 
 
+// src/pipe.ts
+var _phecdacore = require('phecda-core');
+
 // src/exception/base.ts
 var Exception = class extends Error {
   static {
@@ -198,21 +201,33 @@ var WorkerException = class extends Exception {
 };
 
 // src/pipe.ts
-var defaultPipe = /* @__PURE__ */ _chunk4LLLQOMFjs.__name.call(void 0, async ({ arg, reflect, rawMeta, index }) => {
-  if (arg !== void 0 && [
+var defaultPipe = /* @__PURE__ */ _chunk4LLLQOMFjs.__name.call(void 0, async ({ arg, reflect, meta, index }, { method }) => {
+  if (arg === void 0) {
+    if (meta.required === false) return arg;
+    else throw new ValidateException(`param ${index + 1} is required`);
+  }
+  if ([
     Number,
     Boolean,
     String
   ].includes(reflect)) arg = reflect(arg);
-  if (rawMeta.required && arg === void 0) throw new ValidateException(`param ${index} is required`);
-  if (rawMeta.rules) {
-    for (const rule of rawMeta.rules) {
-      let res = rule(arg);
-      if (res instanceof Promise) res = await res;
-      if (typeof res === "string") throw new ValidateException(res);
-      if (res === false) throw new ValidateException(`validation failed for param ${index}`);
+  if (reflect === Number && isNaN(arg)) throw new ValidateException(`param ${index + 1} is not a number`);
+  if (meta.rules) {
+    for (const rule of meta.rules) {
+      const err = await rule({
+        value: arg,
+        property: method,
+        meta,
+        model: reflect,
+        index
+      });
+      if (err.length > 0) throw new ValidateException(err[0]);
     }
   }
+  if (_phecdacore.isPhecda.call(void 0, reflect)) {
+    const errs = await _phecdacore.validate.call(void 0, reflect, arg);
+    if (errs.length) throw new ValidateException(errs[0]);
+  }
   return arg;
 }, "defaultPipe");
 
@@ -265,7 +280,7 @@ var Context = (_class = class _Context {
   }
   static getAop(meta, opts) {
     const { globalGuards = [], globalFilter = "default", globalPipe = "default" } = opts;
-    const { data: { guards, filter, params, tag, func } } = meta;
+    const { data: { guards, filter, params, tag, method } } = meta;
     const resolved = {
       guards: [
         ...globalGuards,
@@ -276,7 +291,7 @@ var Context = (_class = class _Context {
     };
     if (process.env.DEBUG) {
       const { guards: guards2, pipe, filter: filter2 } = resolved;
-      debug(`func "${tag}-${func}" aop: 
+      debug(`method "${tag}-${method}" aop: 
 ${_picocolors2.default.magenta(`Guard ${guards2.join("->")}[${guards2.filter((g) => g in this.guardRecord).join("->")}]`)}
 ${_picocolors2.default.blue(`Pipe ${pipe.join("-")}[${pipe.map((p) => p in this.pipeRecord ? p : "default").join("-")}]`)}
 ${_picocolors2.default.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
@@ -289,7 +304,7 @@ ${_picocolors2.default.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
   }
   async run({ guards, filter, pipe }, successCb, failCb) {
     const { meta, moduleMap } = this.data;
-    const { paramsType, data: { ctxs, tag, params, func } } = meta;
+    const { paramsType, data: { ctxs, tag, params, method } } = meta;
     try {
       let res;
       const nextHandler = /* @__PURE__ */ _chunk4LLLQOMFjs.__name.call(void 0, (index) => {
@@ -304,13 +319,13 @@ ${_picocolors2.default.red(`Filter ${filter2}[${filter2 || "default"}]`)}`);
               reflect: paramsType[item.index],
               ...item
             }, this.ctx)));
-            res = await instance[func](...args);
+            res = await instance[method](...args);
           } else {
             let nextPromise;
             async function next() {
               return nextPromise = nextHandler(index + 1)().then((ret2) => {
                 if (ret2 !== void 0) {
-                  debug(`The ${index + 1}th guard on "${tag}-${func}" rewrite the response value.`);
+                  debug(`The ${index + 1}th guard on "${tag}-${method}" rewrite the response value.`);
                   res = ret2;
                 }
                 return res;
@@ -409,11 +424,11 @@ function createControllerMetaMap(meta, filter) {
   function handleMeta() {
     metaMap.clear();
     for (const item of meta) {
-      const { tag, func } = item.data;
+      const { tag, method } = item.data;
       if (!filter(item)) continue;
-      if (metaMap.has(tag)) metaMap.get(tag)[func] = item;
+      if (metaMap.has(tag)) metaMap.get(tag)[method] = item;
       else metaMap.set(tag, {
-        [func]: item
+        [method]: item
       });
     }
   }

package/dist/{core-B5yKYkMJ.d.mts → core-BTSHIAyB.d.ts}

@@ -1,9 +1,10 @@
 import { Construct } from 'phecda-core';
-import { M as Meta, E as Emitter } from './meta-C_eDyXnK.mjs';
+import { M as Meta, E as Emitter } from './meta-DNF6Fl27.js';
 
 declare abstract class Generator {
     private _path;
     constructor(path?: string);
+    ext: string;
     abstract name: string;
     get path(): string;
     abstract generateCode(meta: Meta[]): string;

package/dist/{core-BRuvL6hY.d.ts → core-D1YYphEn.d.mts}

@@ -1,9 +1,10 @@
 import { Construct } from 'phecda-core';
-import { M as Meta, E as Emitter } from './meta-C_eDyXnK.js';
+import { M as Meta, E as Emitter } from './meta-DNF6Fl27.mjs';
 
 declare abstract class Generator {
     private _path;
     constructor(path?: string);
+    ext: string;
     abstract name: string;
     get path(): string;
     abstract generateCode(meta: Meta[]): string;

package/dist/helper.d.mts

@@ -1,4 +1,4 @@
-import { M as Meta, a as ControllerMeta } from './meta-C_eDyXnK.mjs';
+import { M as Meta, a as ControllerMeta } from './meta-DNF6Fl27.mjs';
 import { Construct } from 'phecda-core';
 
 declare function HMR(cb: (oldModels: Construct[], newModels: Construct[]) => any): void;

package/dist/helper.d.ts

@@ -1,4 +1,4 @@
-import { M as Meta, a as ControllerMeta } from './meta-C_eDyXnK.js';
+import { M as Meta, a as ControllerMeta } from './meta-DNF6Fl27.js';
 import { Construct } from 'phecda-core';
 
 declare function HMR(cb: (oldModels: Construct[], newModels: Construct[]) => any): void;

package/dist/helper.js

@@ -5,7 +5,7 @@
 
 
 
-var _chunkOV3UJLGPjs = require('./chunk-OV3UJLGP.js');
+var _chunkYJ3QHGTCjs = require('./chunk-YJ3QHGTC.js');
 
 
 
@@ -21,4 +21,4 @@ var _chunk4LLLQOMFjs = require('./chunk-4LLLQOMF.js');
 
 
 
-exports.HMR = _chunk4LLLQOMFjs.HMR; exports.RELAUNCH = _chunk4LLLQOMFjs.RELAUNCH; exports.RELOAD = _chunk4LLLQOMFjs.RELOAD; exports.createControllerMetaMap = _chunkOV3UJLGPjs.createControllerMetaMap; exports.detectAopDep = _chunkOV3UJLGPjs.detectAopDep; exports.joinUrl = _chunkOV3UJLGPjs.joinUrl; exports.mergeObject = _chunkOV3UJLGPjs.mergeObject; exports.resolveDep = _chunkOV3UJLGPjs.resolveDep; exports.shallowClone = _chunkOV3UJLGPjs.shallowClone;
+exports.HMR = _chunk4LLLQOMFjs.HMR; exports.RELAUNCH = _chunk4LLLQOMFjs.RELAUNCH; exports.RELOAD = _chunk4LLLQOMFjs.RELOAD; exports.createControllerMetaMap = _chunkYJ3QHGTCjs.createControllerMetaMap; exports.detectAopDep = _chunkYJ3QHGTCjs.detectAopDep; exports.joinUrl = _chunkYJ3QHGTCjs.joinUrl; exports.mergeObject = _chunkYJ3QHGTCjs.mergeObject; exports.resolveDep = _chunkYJ3QHGTCjs.resolveDep; exports.shallowClone = _chunkYJ3QHGTCjs.shallowClone;

package/dist/helper.mjs

@@ -5,7 +5,7 @@ import {
   mergeObject,
   resolveDep,
   shallowClone
-} from "./chunk-P3CS65OP.mjs";
+} from "./chunk-VAHCYYCB.mjs";
 import {
   HMR,
   RELAUNCH,

package/dist/http/elysia/index.d.mts

@@ -1,9 +1,9 @@
 import { Elysia as Elysia$1, Context, LocalHook, InputSchema, RouteSchema, SingletonBase } from 'elysia';
 import { BaseMacro } from 'elysia/dist/types';
-import { H as HttpCtx, a as HttpOptions } from '../../types-BKHBmSQN.mjs';
-import { F as Factory } from '../../core-B5yKYkMJ.mjs';
+import { H as HttpCtx, a as HttpOptions } from '../../types-DtiHAXQB.mjs';
+import { F as Factory } from '../../core-D1YYphEn.mjs';
 import 'node:http';
-import '../../meta-C_eDyXnK.mjs';
+import '../../meta-DNF6Fl27.mjs';
 import 'phecda-core';
 
 interface ElysiaCtx extends HttpCtx {

package/dist/http/elysia/index.d.ts

@@ -1,9 +1,9 @@
 import { Elysia as Elysia$1, Context, LocalHook, InputSchema, RouteSchema, SingletonBase } from 'elysia';
 import { BaseMacro } from 'elysia/dist/types';
-import { H as HttpCtx, a as HttpOptions } from '../../types-BuvMT1ta.js';
-import { F as Factory } from '../../core-BRuvL6hY.js';
+import { H as HttpCtx, a as HttpOptions } from '../../types-Cosv4nol.js';
+import { F as Factory } from '../../core-BTSHIAyB.js';
 import 'node:http';
-import '../../meta-C_eDyXnK.js';
+import '../../meta-DNF6Fl27.js';
 import 'phecda-core';
 
 interface ElysiaCtx extends HttpCtx {