phecda-server 7.0.0-alpha.4 → 7.0.0-alpha.6

package/dist/rpc/redis/index.js

@@ -4,29 +4,29 @@
 
 
 
-var _chunk6EBEME3Ijs = require('../../chunk-6EBEME3I.js');
+var _chunkJF4YU32Ejs = require('../../chunk-JF4YU32E.js');
 
 
-var _chunkRQSQRZL4js = require('../../chunk-RQSQRZL4.js');
+var _chunk62FBZWGWjs = require('../../chunk-62FBZWGW.js');
 
 // src/rpc/redis/bind.ts
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
 var debug = _debug2.default.call(void 0, "phecda-server/redis");
 function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
   const { globalGuards, globalFilter, globalPipe, globalAddons = [], defaultQueue } = opts;
-  const metaMap = _chunk6EBEME3Ijs.createControllerMetaMap.call(void 0, meta, (meta2) => {
+  const metaMap = _chunkJF4YU32Ejs.createControllerMetaMap.call(void 0, meta, (meta2) => {
     const { controller, rpc, func, tag } = meta2.data;
     if (controller === "rpc" && _optionalChain([rpc, 'optionalAccess', _ => _.queue]) !== void 0) {
       debug(`register method "${func}" in module "${tag}"`);
       return true;
     }
   });
-  _chunk6EBEME3Ijs.detectAopDep.call(void 0, meta, {
+  _chunkJF4YU32Ejs.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
-  _chunk6EBEME3Ijs.Context.applyAddons(globalAddons, {
+  _chunkJF4YU32Ejs.Context.applyAddons(globalAddons, {
     pub,
     sub
   }, "redis");
@@ -45,7 +45,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       }
     }
   }
-  _chunkRQSQRZL4js.__name.call(void 0, subscribeQueues, "subscribeQueues");
+  _chunk62FBZWGWjs.__name.call(void 0, subscribeQueues, "subscribeQueues");
   sub.on("message", async (channel, msg) => {
     if (!existQueue.has(channel)) return;
     if (msg) {
@@ -55,12 +55,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       if (_ps !== 1) return;
       const meta2 = metaMap.get(tag)[func];
       const { data: { rpc: { isEvent } = {} } } = meta2;
-      const aop = _chunk6EBEME3Ijs.Context.getAop(meta2, {
+      const aop = _chunkJF4YU32Ejs.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunk6EBEME3Ijs.Context)({
+      const context = new (0, _chunkJF4YU32Ejs.Context)({
         type: "redis",
         category: "rpc",
         moduleMap,
@@ -92,12 +92,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
     }
   });
   subscribeQueues();
-  _chunk6EBEME3Ijs.HMR.call(void 0, async () => {
+  _chunkJF4YU32Ejs.HMR.call(void 0, async () => {
     for (const queue of existQueue) await sub.unsubscribe(queue);
     subscribeQueues();
   });
 }
-_chunkRQSQRZL4js.__name.call(void 0, bind, "bind");
+_chunk62FBZWGWjs.__name.call(void 0, bind, "bind");
 
 // src/rpc/redis/client.ts
 var _events = require('events'); var _events2 = _interopRequireDefault(_events);
@@ -106,7 +106,7 @@ async function createClient({ pub, sub }, controllers, opts) {
   let eventId = 1;
   let eventCount = 0;
   const emitter = new (0, _events2.default)();
-  const clientQueue = _chunk6EBEME3Ijs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
+  const clientQueue = _chunkJF4YU32Ejs.genClientQueue.call(void 0, _optionalChain([opts, 'optionalAccess', _2 => _2.key]));
   await sub.subscribe(clientQueue);
   for (const i in controllers) {
     ret[i] = new Proxy(new controllers[i](), {
@@ -146,7 +146,7 @@ async function createClient({ pub, sub }, controllers, opts) {
               if (error) reject(data);
               else resolve(data);
             }
-            _chunkRQSQRZL4js.__name.call(void 0, listener, "listener");
+            _chunk62FBZWGWjs.__name.call(void 0, listener, "listener");
             eventCount++;
             emitter.once(id, listener);
           });
@@ -162,7 +162,7 @@ async function createClient({ pub, sub }, controllers, opts) {
   });
   return ret;
 }
-_chunkRQSQRZL4js.__name.call(void 0, createClient, "createClient");
+_chunk62FBZWGWjs.__name.call(void 0, createClient, "createClient");
 
 
 

package/dist/rpc/redis/index.mjs

@@ -4,10 +4,10 @@ import {
   createControllerMetaMap,
   detectAopDep,
   genClientQueue
-} from "../../chunk-MMG73S64.mjs";
+} from "../../chunk-3C7Z3IJN.mjs";
 import {
   __name
-} from "../../chunk-QD3QR3NW.mjs";
+} from "../../chunk-KSDE5G57.mjs";
 
 // src/rpc/redis/bind.ts
 import Debug from "debug";

package/dist/test.d.mts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-CSiaRU7r.mjs';
-import { P as PickFunc } from './meta-D1M85Hef.mjs';
+import { F as Factory } from './core-DU7gQKSk.mjs';
+import { P as PickFunc } from './meta-BTnLXuCa.mjs';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.d.ts

@@ -2,8 +2,8 @@ import * as supertest from 'supertest';
 import { Test } from 'supertest';
 import { Server } from 'node:http';
 import { Construct } from 'phecda-core';
-import { F as Factory } from './core-C1kHRqU9.js';
-import { P as PickFunc } from './meta-D1M85Hef.js';
+import { F as Factory } from './core-CzElxZoF.js';
+import { P as PickFunc } from './meta-BTnLXuCa.js';
 
 declare function TestFactory<T extends Construct[]>(...Modules: T): Promise<{
     get<C extends T[number]>(Model: C): InstanceType<C>;
@@ -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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.js

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
-var _chunkPKSWGQLWjs = require('./chunk-PKSWGQLW.js');
+var _chunkWYI2F7LDjs = require('./chunk-WYI2F7LD.js');
 
 
-var _chunkRQSQRZL4js = require('./chunk-RQSQRZL4.js');
+var _chunk62FBZWGWjs = require('./chunk-62FBZWGW.js');
 
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, modelMap } = await _chunkPKSWGQLWjs.Factory.call(void 0, Modules);
+  const { moduleMap, modelMap } = await _chunkWYI2F7LDjs.Factory.call(void 0, Modules);
   return {
     get(Model) {
       const tag = _phecdacore.getTag.call(void 0, Model);
@@ -19,7 +19,7 @@ async function TestFactory(...Modules) {
     }
   };
 }
-_chunkRQSQRZL4js.__name.call(void 0, TestFactory, "TestFactory");
+_chunk62FBZWGWjs.__name.call(void 0, TestFactory, "TestFactory");
 async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
   const { default: request, agent } = await Promise.resolve().then(() => _interopRequireWildcard(require("supertest")));
   const Agent = agent(app);
@@ -59,11 +59,11 @@ async function TestHttp(app, { moduleMap, meta }, isAgent = true) {
       }
     });
   }
-  _chunkRQSQRZL4js.__name.call(void 0, module, "module");
+  _chunk62FBZWGWjs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkRQSQRZL4js.__name.call(void 0, TestHttp, "TestHttp");
+_chunk62FBZWGWjs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-A53KNKY4.mjs";
+} from "./chunk-HTY3H33L.mjs";
 import {
   __name
-} from "./chunk-QD3QR3NW.mjs";
+} from "./chunk-KSDE5G57.mjs";
 
 // src/test.ts
 import { getTag } from "phecda-core";

package/dist/{types-ee1FBodH.d.ts → types--E-OCZhC.d.ts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.js';
 
 interface HttpOptions extends DefaultOptions {
     /**

package/dist/{types-JMhFVp-Z.d.mts → types-BYqBeqrs.d.mts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.mjs';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;

package/dist/{types-wbHHC93P.d.mts → types-BxlzVoRv.d.mts}

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:http';
-import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.mjs';
+import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.mjs';
 
 interface HttpOptions extends DefaultOptions {
     /**

package/dist/{types-C9Remkup.d.ts → types-CbfaGkPA.d.ts}

@@ -1,4 +1,4 @@
-import { D as DefaultOptions, B as BaseContext } from './meta-D1M85Hef.js';
+import { D as DefaultOptions, B as BaseContext } from './meta-BTnLXuCa.js';
 
 interface RpcServerOptions extends DefaultOptions {
     defaultQueue?: string;

package/package.json

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

package/register/loader.mjs

@@ -314,7 +314,8 @@ export const load = async (url, context, nextLoad) => {
 
     const code
       = typeof source === 'string' ? source : Buffer.from(source).toString()
-    const compiled = await compile(code, url)
+    const compiled = (await compile(code, url)).replace(/_ts_metadata\(\"design:paramtypes\"\,/g, '_ts_metadata("design:paramtypes",()=>')// handle cycle
+
     if (unimportRet) {
       const { injectImports } = unimportRet
       return {

package/register/utils.mjs

@@ -1,56 +1,56 @@
-import { basename } from 'path'
-import { transform } from '@swc-node/core'
-const injectInlineSourceMap = ({ code, map }) => {
-  if (map) {
-    const base64Map = Buffer.from(map, 'utf8').toString('base64')
-    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
-    return `${code}\n${sourceMapContent}`
-  }
-  return code
-}
-
-export async function compile(sourcecode, filename) {
-  if (filename.endsWith('.d.ts'))
-    return ''
-
-  const { code, map } = await transform(sourcecode, filename, {
-    sourcemap: true,
-    module: 'es6',
-    emitDecoratorMetadata: true,
-    experimentalDecorators: true,
-    esModuleInterop: false,
-  })
-
-  return injectInlineSourceMap({ code, map })
-}
-
-export async function genUnImportRet(opts) {
-  try {
-    const psExports = Object.keys(await import('../dist/index.mjs'))
-    const { createUnimport } = await import('unimport')
-    return createUnimport({
-      ...opts,
-      imports: psExports
-        .map((k) => {
-          return { name: k, from: 'phecda-server' }
-        })
-        .concat(opts.imports || []),
-    })
-  }
-  catch (e) {
-    return false
-  }
-}
-
-export function handleClassTypes(input) {
-  return input.replace(/const\s+(\w+)\s*:\s*typeof\s+import\(['"](.+)['"]\)\['(\w+)'\]/g, (_, n, p, e) => {
-    // TestController in test.controller
-    if (p.startsWith('./') && (basename(p).replace('.', '').toLowerCase() === e.toLowerCase()))
-      return `${_}\n  type ${n} = InstanceType<typeof import('${p}')['${e}']>`
-
-    return _
-  })
-}
-export function slash(str) {
-  return str.replace(/\\/g, '/')
-}
+import { basename } from 'path'
+import { transform } from '@swc-node/core'
+const injectInlineSourceMap = ({ code, map }) => {
+  if (map) {
+    const base64Map = Buffer.from(map, 'utf8').toString('base64')
+    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
+    return `${code}\n${sourceMapContent}`
+  }
+  return code
+}
+
+export async function compile(sourcecode, filename) {
+  if (filename.endsWith('.d.ts'))
+    return ''
+
+  const { code, map } = await transform(sourcecode, filename, {
+    sourcemap: true,
+    module: 'es6',
+    emitDecoratorMetadata: true,
+    experimentalDecorators: true,
+    esModuleInterop: false,
+  })
+
+  return injectInlineSourceMap({ code, map })
+}
+
+export async function genUnImportRet(opts) {
+  try {
+    const psExports = Object.keys(await import('../dist/index.mjs'))
+    const { createUnimport } = await import('unimport')
+    return createUnimport({
+      ...opts,
+      imports: psExports
+        .map((k) => {
+          return { name: k, from: 'phecda-server' }
+        })
+        .concat(opts.imports || []),
+    })
+  }
+  catch (e) {
+    return false
+  }
+}
+
+export function handleClassTypes(input) {
+  return input.replace(/const\s+(\w+)\s*:\s*typeof\s+import\(['"](.+)['"]\)\['(\w+)'\]/g, (_, n, p, e) => {
+    // TestController in test.controller
+    if (p.startsWith('./') && (basename(p).replace('.', '').toLowerCase() === e.toLowerCase()))
+      return `${_}\n  type ${n} = InstanceType<typeof import('${p}')['${e}']>`
+
+    return _
+  })
+}
+export function slash(str) {
+  return str.replace(/\\/g, '/')
+}

package/dist/chunk-QD3QR3NW.mjs

@@ -1,73 +0,0 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
-// src/common.ts
-var ERROR_SYMBOL = "__PS_ERROR__";
-var IS_HMR = process.env.NODE_ENV === "development";
-var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
-var IS_STRICT = !!process.env.PS_STRICT;
-var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
-var PS_EXIT_CODE = /* @__PURE__ */ function(PS_EXIT_CODE2) {
-  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 2] = "RELAUNCH";
-  PS_EXIT_CODE2[PS_EXIT_CODE2["CODE"] = 4] = "CODE";
-  return PS_EXIT_CODE2;
-}({});
-
-// src/utils.ts
-import pc from "picocolors";
-import { Mixin } from "ts-mixer";
-var time;
-var internalLogger;
-function setLogger(logger) {
-  internalLogger = logger;
-}
-__name(setLogger, "setLogger");
-function getLogger() {
-  return internalLogger;
-}
-__name(getLogger, "getLogger");
-function log(msg, level = "log") {
-  if (internalLogger) internalLogger[level](msg);
-  const logLevel = {
-    debug: -1,
-    info: 0,
-    log: 1,
-    warn: 2,
-    error: 3
-  }[level];
-  if (logLevel < LOG_LEVEL) return;
-  const color = {
-    debug: "bgMagenta",
-    error: "red",
-    info: "gray",
-    warn: "yellow",
-    log: "green"
-  }[level];
-  const date = /* @__PURE__ */ new Date();
-  const current = Date.now();
-  const interval = time && current - time ? `+${current - time}` : "";
-  time = current;
-  console[level](`${pc.magenta("[phecda-server]")} ${pc.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${pc[color](msg)} ${pc.gray(interval)}`);
-}
-__name(log, "log");
-function runMiddleware(ctx, middleware) {
-  return new Promise((resolve) => {
-    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
-  });
-}
-__name(runMiddleware, "runMiddleware");
-
-export {
-  __name,
-  ERROR_SYMBOL,
-  IS_HMR,
-  IS_ONLY_GENERATE,
-  IS_STRICT,
-  LOG_LEVEL,
-  PS_EXIT_CODE,
-  setLogger,
-  getLogger,
-  log,
-  runMiddleware,
-  Mixin
-};

package/dist/chunk-RQSQRZL4.js

@@ -1,73 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
-// src/common.ts
-var ERROR_SYMBOL = "__PS_ERROR__";
-var IS_HMR = process.env.NODE_ENV === "development";
-var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
-var IS_STRICT = !!process.env.PS_STRICT;
-var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
-var PS_EXIT_CODE = /* @__PURE__ */ function(PS_EXIT_CODE2) {
-  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 2] = "RELAUNCH";
-  PS_EXIT_CODE2[PS_EXIT_CODE2["CODE"] = 4] = "CODE";
-  return PS_EXIT_CODE2;
-}({});
-
-// src/utils.ts
-var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
-var _tsmixer = require('ts-mixer');
-var time;
-var internalLogger;
-function setLogger(logger) {
-  internalLogger = logger;
-}
-__name(setLogger, "setLogger");
-function getLogger() {
-  return internalLogger;
-}
-__name(getLogger, "getLogger");
-function log(msg, level = "log") {
-  if (internalLogger) internalLogger[level](msg);
-  const logLevel = {
-    debug: -1,
-    info: 0,
-    log: 1,
-    warn: 2,
-    error: 3
-  }[level];
-  if (logLevel < LOG_LEVEL) return;
-  const color = {
-    debug: "bgMagenta",
-    error: "red",
-    info: "gray",
-    warn: "yellow",
-    log: "green"
-  }[level];
-  const date = /* @__PURE__ */ new Date();
-  const current = Date.now();
-  const interval = time && current - time ? `+${current - time}` : "";
-  time = current;
-  console[level](`${_picocolors2.default.magenta("[phecda-server]")} ${_picocolors2.default.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${_picocolors2.default[color](msg)} ${_picocolors2.default.gray(interval)}`);
-}
-__name(log, "log");
-function runMiddleware(ctx, middleware) {
-  return new Promise((resolve) => {
-    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
-  });
-}
-__name(runMiddleware, "runMiddleware");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-exports.__name = __name; exports.ERROR_SYMBOL = ERROR_SYMBOL; exports.IS_HMR = IS_HMR; exports.IS_ONLY_GENERATE = IS_ONLY_GENERATE; exports.IS_STRICT = IS_STRICT; exports.LOG_LEVEL = LOG_LEVEL; exports.PS_EXIT_CODE = PS_EXIT_CODE; exports.setLogger = setLogger; exports.getLogger = getLogger; exports.log = log; exports.runMiddleware = runMiddleware; exports.Mixin = _tsmixer.Mixin;