phecda-server 5.2.0 → 5.2.2

package/assets/ps.json

@@ -1,25 +1,24 @@
 {
-    "$schema": "https://unpkg.com/phecda-server/bin/schema.json",
-    "resolve": [
-      {
-        "source": "controller",
-        "importer": "http",
-        "path": ".ps/http.js"
-      },
-      {
-        "source": "rpc",
-        "importer": "client",
-        "path": ".ps/rpc.js"
-      }
-    ],
+  "$schema": "https://unpkg.com/phecda-server/assets/schema.json",
+  "resolve": [
+    {
+      "source": "controller",
+      "importer": "http",
+      "path": ".ps/http.js"
+    },
+    {
+      "source": "rpc",
+      "importer": "client",
+      "path": ".ps/rpc.js"
+    }
+  ],
   "unimport": {
     "dirs": ["."],
-    "dirsScanOptions":{
-      "filePatterns":["*.{service,controller,module,rpc,edge,guard,interceptor,extension,pipe,filter,plugin}.ts"]
-     }
-   },
-    "virtualFile":{},
-    "moduleFile": []
-    
-  }
-  
+    "dirsScanOptions": {
+      "filePatterns": ["*.{service,controller,module,rpc,edge,guard,interceptor,extension,pipe,filter,plugin}.ts"]
+    }
+  },
+  "virtualFile": {},
+  "moduleFile": []
+
+}

package/bin/cli.mjs

@@ -9,10 +9,9 @@ import cac from 'cac'
 import fse from 'fs-extra'
 import { log } from '../dist/index.mjs'
 
-const cli = cac('phecda')
-  .option('-c,--config <config>', 'config file', {
-    default: 'ps.json',
-  })
+const cli = cac('phecda').option('-c,--config <config>', 'config file', {
+  default: 'ps.json',
+})
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
@@ -75,19 +74,25 @@ process.on('SIGINT', () => {
 })
 
 cli
-  .command('init [workdir]', 'init config file')
+  .command('init [root]', 'init config file')
   .allowUnknownOptions()
   .option('-t,--tsconfig <tsconfig>', 'init tsconfig file', {
     default: 'tsconfig.json',
   })
-  .action(async (workdir, options) => {
-    const tsconfigPath = join(workdir, options.tsconfig)
-    const psconfigPath = join(workdir, options.config)
+  .action(async (root, options) => {
+    if (!root)
+      root = ''
+
+    const tsconfigPath = join(root, options.tsconfig)
+    const psconfigPath = join(root, options.config)
 
     if (!fse.existsSync(tsconfigPath)) {
       log(`create ${tsconfigPath}`)
 
-      await fse.copyFile(resolve(__dirname, '../assets/tsconfig.json'), tsconfigPath)
+      await fse.copyFile(
+        resolve(__dirname, '../assets/tsconfig.json'),
+        tsconfigPath,
+      )
     }
 
     if (!fse.existsSync(psconfigPath)) {
@@ -95,15 +100,17 @@ cli
 
       await fse.copyFile(resolve(__dirname, '../assets/ps.json'), psconfigPath)
     }
+
+    log('init finish')
   })
 
 cli
-  .command('<file> [workdir]', 'run file')
+  .command('<file> [root]', 'run file')
   .allowUnknownOptions()
   .alias('run')
-  .action((file, workdir, options) => {
-    if (workdir)
-      process.env.PS_WORKDIR = workdir
+  .action((file, root, options) => {
+    if (root)
+      process.env.PS_WORKDIR = root
     process.env.PS_CONFIG_FILE = options.config
 
     log('process start!')
@@ -134,11 +141,11 @@ cli
   })
 
 cli
-  .command('generate <file> [workdir]', 'generate code(mainly for ci)')
+  .command('generate <file> [root]', 'generate code(mainly for ci)')
   .allowUnknownOptions()
-  .action((file, workdir, options) => {
-    if (workdir)
-      process.env.PS_WORKDIR = workdir
+  .action((file, root, options) => {
+    if (root)
+      process.env.PS_WORKDIR = root
     process.env.PS_GENERATE = 'true'
     process.env.PS_CONFIG_FILE = options.config
     startChild(file, options['--'])

package/dist/helper.d.ts

@@ -1,11 +1,13 @@
-import { h as Meta, i as ControllerMeta } from './types-81be0ba3.js';
-export { a as HttpContext, H as HttpOptions, b as argToReq, r as resolveDep } from './helper-49c7213c.js';
-export { a as RpcClientOptions, b as RpcContext, R as RpcServerOptions, g as genClientQueue } from './helper-5d755442.js';
+import { C as ControllerMetaData, h as Meta, i as ControllerMeta } from './types-81be0ba3.js';
 import 'phecda-core';
-import 'node:http';
 
 declare function HMR(cb: (...args: any) => any): void;
 
+declare function resolveDep(ret: any, key: string): any;
+declare function argToReq(params: ControllerMetaData['params'], args: any[], headers: Record<string, any>): any;
+
+declare function genClientQueue(key?: string): string;
+
 declare function shallowClone(obj: any): any;
 declare function mergeObject(...args: any[]): any;
 
@@ -22,4 +24,4 @@ declare function detectAopDep(meta: Meta[], { guards, interceptors, plugins }?:
     filterSet: Set<string>;
 };
 
-export { HMR, createControllerMetaMap, detectAopDep, mergeObject, shallowClone };
+export { HMR, argToReq, createControllerMetaMap, detectAopDep, genClientQueue, mergeObject, resolveDep, shallowClone };

package/dist/index.d.ts

@@ -4,6 +4,9 @@ import { G as Generator } from './core-7f6d2be6.js';
 export { F as Factory, e as emitter } from './core-7f6d2be6.js';
 import { Construct, AbConstruct } from 'phecda-core';
 export * from 'phecda-core';
+export { a as HttpContext, H as HttpOptions } from './types-68f2ec2a.js';
+export { a as RpcClientOptions, b as RpcContext, R as RpcServerOptions } from './types-f3b79218.js';
+import 'node:http';
 
 declare class Exception extends Error {
     message: string;

package/dist/rpc/bullmq/index.d.ts

@@ -1,6 +1,6 @@
 import { WorkerOptions, QueueOptions, Worker, Queue } from 'bullmq';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../helper-5d755442.js';
+import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../types-f3b79218.js';
 import { T as ToClientMap } from '../../types-81be0ba3.js';
 import 'phecda-core';
 

package/dist/rpc/kafka/index.d.ts

@@ -1,6 +1,6 @@
 import { Consumer, Producer } from 'kafkajs';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../helper-5d755442.js';
+import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../types-f3b79218.js';
 import { T as ToClientMap } from '../../types-81be0ba3.js';
 import 'phecda-core';
 

package/dist/rpc/nats/index.d.ts

@@ -1,6 +1,6 @@
 import { NatsConnection } from 'nats';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../helper-5d755442.js';
+import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../types-f3b79218.js';
 import { T as ToClientMap } from '../../types-81be0ba3.js';
 import 'phecda-core';
 

package/dist/rpc/rabbitmq/index.d.ts

@@ -1,6 +1,6 @@
 import amqplib from 'amqplib';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../helper-5d755442.js';
+import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../types-f3b79218.js';
 import { T as ToClientMap } from '../../types-81be0ba3.js';
 import 'phecda-core';
 

package/dist/rpc/redis/index.d.ts

@@ -1,6 +1,6 @@
 import Redis from 'ioredis';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../helper-5d755442.js';
+import { b as RpcContext, R as RpcServerOptions, a as RpcClientOptions } from '../../types-f3b79218.js';
 import { T as ToClientMap } from '../../types-81be0ba3.js';
 import 'phecda-core';
 

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

@@ -1,6 +1,6 @@
 import { Elysia as Elysia$1, Context, LocalHook, InputSchema, RouteSchema, SingletonBase } from 'elysia';
 import { BaseMacro } from 'elysia/dist/types';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/server/express/index.d.ts

@@ -1,5 +1,5 @@
 import { Request, Response, Router, RequestHandler } from 'express';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/server/fastify/index.d.ts

@@ -1,5 +1,5 @@
 import { FastifyRequest, FastifyReply, FastifyInstance, FastifyPluginCallback, FastifyRegisterOptions, FastifyPluginOptions, RouteShorthandOptions } from 'fastify';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/server/h3/index.d.ts

@@ -1,6 +1,6 @@
 import { H3Event, Router, _RequestMiddleware } from 'h3';
 import { F as Factory } from '../../core-7f6d2be6.js';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import 'phecda-core';
 import '../../types-81be0ba3.js';
 import 'node:http';

package/dist/server/hono/index.d.ts

@@ -1,5 +1,5 @@
 import { Context, Hono, MiddlewareHandler } from 'hono';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/server/hyper-express/index.d.ts

@@ -1,5 +1,5 @@
 import { Request, Response, Router, MiddlewareHandler } from 'hyper-express';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/server/koa/index.d.ts

@@ -1,6 +1,6 @@
 import Router, { RouterParamContext } from '@koa/router';
 import { DefaultContext, DefaultState } from 'koa';
-import { a as HttpContext, H as HttpOptions } from '../../helper-49c7213c.js';
+import { a as HttpContext, H as HttpOptions } from '../../types-68f2ec2a.js';
 import { F as Factory } from '../../core-7f6d2be6.js';
 import 'node:http';
 import '../../types-81be0ba3.js';

package/dist/test.d.ts

@@ -11,7 +11,7 @@ declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
 type SuperTestRequest<T> = {
     [K in keyof T]: T[K] extends (...args: infer R) => any ? (...args: R) => Test : never;
 };
-declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "key" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "key" | "query" | "use" | "on" | "set" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/{helper-49c7213c.d.ts → types-68f2ec2a.d.ts}

@@ -1,7 +1,6 @@
 import { IncomingHttpHeaders } from 'node:http';
-import { D as DefaultOptions, B as BaseContext, C as ControllerMetaData } from './types-81be0ba3.js';
+import { D as DefaultOptions, B as BaseContext } from './types-81be0ba3.js';
 
-declare function resolveDep(ret: any, key: string): any;
 interface HttpOptions extends DefaultOptions {
     parallelRoute?: string | false;
     parallelPlugins?: string[];
@@ -15,6 +14,5 @@ interface HttpContext extends BaseContext {
     body: Record<string, any>;
     headers: IncomingHttpHeaders;
 }
-declare function argToReq(params: ControllerMetaData['params'], args: any[], headers: Record<string, any>): any;
 
-export { HttpOptions as H, HttpContext as a, argToReq as b, resolveDep as r };
+export { HttpOptions as H, HttpContext as a };

package/dist/{helper-5d755442.d.ts → types-f3b79218.d.ts}

@@ -1,6 +1,5 @@
 import { D as DefaultOptions, B as BaseContext } from './types-81be0ba3.js';
 
-declare function genClientQueue(key?: string): string;
 interface RpcServerOptions extends DefaultOptions {
 }
 interface RpcClientOptions {
@@ -15,4 +14,4 @@ interface RpcContext extends BaseContext {
     isEvent?: boolean;
 }
 
-export { RpcServerOptions as R, RpcClientOptions as a, RpcContext as b, genClientQueue as g };
+export { RpcServerOptions as R, RpcClientOptions as a, RpcContext as b };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",