phecda-server 7.0.0-alpha.3 → 7.0.0-alpha.5

package/dist/rpc/redis/index.js

@@ -4,29 +4,29 @@
 
 
 
-var _chunk6EBEME3Ijs = require('../../chunk-6EBEME3I.js');
+var _chunkK54JYYXKjs = require('../../chunk-K54JYYXK.js');
 
 
-var _chunkRQSQRZL4js = require('../../chunk-RQSQRZL4.js');
+var _chunkKFFS2P7Ijs = require('../../chunk-KFFS2P7I.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 = _chunkK54JYYXKjs.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, {
+  _chunkK54JYYXKjs.detectAopDep.call(void 0, meta, {
     guards: globalGuards,
     addons: globalAddons
   }, "rpc");
   const existQueue = /* @__PURE__ */ new Set();
-  _chunk6EBEME3Ijs.Context.applyAddons(globalAddons, {
+  _chunkK54JYYXKjs.Context.applyAddons(globalAddons, {
     pub,
     sub
   }, "redis");
@@ -45,7 +45,7 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
       }
     }
   }
-  _chunkRQSQRZL4js.__name.call(void 0, subscribeQueues, "subscribeQueues");
+  _chunkKFFS2P7Ijs.__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 = _chunkK54JYYXKjs.Context.getAop(meta2, {
         globalFilter,
         globalGuards,
         globalPipe
       });
-      const context = new (0, _chunk6EBEME3Ijs.Context)({
+      const context = new (0, _chunkK54JYYXKjs.Context)({
         type: "redis",
         category: "rpc",
         moduleMap,
@@ -92,12 +92,12 @@ function bind({ sub, pub }, { moduleMap, meta }, opts = {}) {
     }
   });
   subscribeQueues();
-  _chunk6EBEME3Ijs.HMR.call(void 0, async () => {
+  _chunkK54JYYXKjs.HMR.call(void 0, async () => {
     for (const queue of existQueue) await sub.unsubscribe(queue);
     subscribeQueues();
   });
 }
-_chunkRQSQRZL4js.__name.call(void 0, bind, "bind");
+_chunkKFFS2P7Ijs.__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 = _chunkK54JYYXKjs.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");
+            _chunkKFFS2P7Ijs.__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");
+_chunkKFFS2P7Ijs.__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-2ESEXJQM.mjs";
 import {
   __name
-} from "../../chunk-QD3QR3NW.mjs";
+} from "../../chunk-UXGJD2PK.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>;

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>;

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 _chunkTR5Z4SDIjs = require('./chunk-TR5Z4SDI.js');
 
 
-var _chunkRQSQRZL4js = require('./chunk-RQSQRZL4.js');
+var _chunkKFFS2P7Ijs = require('./chunk-KFFS2P7I.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 _chunkTR5Z4SDIjs.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");
+_chunkKFFS2P7Ijs.__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");
+  _chunkKFFS2P7Ijs.__name.call(void 0, module, "module");
   Agent.module = module;
   return Agent;
 }
-_chunkRQSQRZL4js.__name.call(void 0, TestHttp, "TestHttp");
+_chunkKFFS2P7Ijs.__name.call(void 0, TestHttp, "TestHttp");
 
 
 

package/dist/test.mjs

@@ -1,9 +1,9 @@
 import {
   Factory
-} from "./chunk-A53KNKY4.mjs";
+} from "./chunk-3ISYBU3P.mjs";
 import {
   __name
-} from "./chunk-QD3QR3NW.mjs";
+} from "./chunk-UXGJD2PK.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.3",
+  "version": "7.0.0-alpha.5",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
@@ -147,7 +147,7 @@
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "ts-mixer": "^6.0.4",
-    "phecda-core": "4.0.1"
+    "phecda-core": "4.1.0-alpha.0"
   },
   "devDependencies": {
     "@koa/router": "^12.0.1",

package/register/index.mjs

@@ -1,40 +1,41 @@
-import { register } from 'node:module'
-import { MessageChannel } from 'node:worker_threads'
-import { log } from '../dist/index.mjs'
-const { port1, port2 } = new MessageChannel()
-
-register('./loader.mjs', {
-  parentURL: import.meta.url,
-  data: { port: port2 },
-  transferList: [port2],
-})
-
-let isRunning = true
-
-port1.on('message', async (data) => {
-  const { type, files } = JSON.parse(data)
-
-  if (!isRunning || !globalThis.__PS_HMR__ || type === 'relaunch')
-    return process.exit(2)// file change -> relaunch
-
-  if (type === 'change') {
-    log('reload module...')
-
-    for (const cb of globalThis.__PS_HMR__) await cb(files)
-
-    log('reload done')
-  }
-})
-
-process.on('uncaughtException', (err) => {
-  log('Uncaught Exception:', 'error')
-  isRunning = false
-  console.error(err)
-})
-
-process.on('unhandledRejection', (err) => {
-  log('Unhandled Promise Rejection:', 'error')
-  isRunning = false
-
-  console.error(err)
-})
+import { register } from 'node:module'
+import { MessageChannel } from 'node:worker_threads'
+import { log } from '../dist/index.mjs'
+
+const { port1, port2 } = new MessageChannel()
+
+register('./loader.mjs', {
+  parentURL: import.meta.url,
+  data: { port: port2 },
+  transferList: [port2],
+})
+
+let isRunning = true
+
+port1.on('message', async (data) => {
+  const { type, files } = JSON.parse(data)
+
+  if (!isRunning || !globalThis.__PS_HMR__ || type === 'relaunch')
+    return process.exit(2)// file change -> relaunch
+
+  if (type === 'change') {
+    log('reload module...')
+
+    for (const cb of globalThis.__PS_HMR__) await cb(files)
+
+    log('reload done')
+  }
+})
+
+process.on('uncaughtException', (err) => {
+  log('Uncaught Exception:', 'error')
+  isRunning = false
+  console.error(err)
+})
+
+process.on('unhandledRejection', (err) => {
+  log('Unhandled Promise Rejection:', 'error')
+  isRunning = false
+
+  console.error(err)
+})

package/register/loader.mjs

@@ -2,26 +2,42 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import { writeFile } from 'fs/promises'
 import {
   basename,
+  dirname,
   extname,
   isAbsolute,
   relative,
   resolve as resolvePath,
 } from 'path'
 import { createRequire } from 'module'
+import { existsSync } from 'fs'
 import ts from 'typescript'
 import chokidar from 'chokidar'
 import { log } from '../dist/index.mjs'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
 let port
+let tsconfig = {
+  module: ts.ModuleKind.ESNext,
+  moduleResolution: ts.ModuleResolutionKind.NodeNext,
+}
 
 const isLowVersion = parseFloat(process.version.slice(1)) < 18.19
 // this part is important or not?
 const EXTENSIONS = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts]
-const tsconfig = {
-  module: ts.ModuleKind.ESNext,
-  moduleResolution: ts.ModuleResolutionKind.NodeNext,
+
+const tsconfigPath = resolvePath(process.cwd(), 'tsconfig.json')
+const tsRet = ts.readConfigFile(tsconfigPath, ts.sys.readFile)
+
+if (!tsRet.error) {
+  const { error, options } = ts.parseJsonConfigFileContent(
+    tsRet.config,
+    ts.sys,
+    dirname(tsconfigPath),
+  )
+  if (!error)
+    tsconfig = options
 }
+
 const moduleResolutionCache = ts.createModuleResolutionCache(
   ts.sys.getCurrentDirectory(),
   x => x,
@@ -56,6 +72,8 @@ export async function initialize(data) {
   config = require(configPath)
   if (!config.virtualFile)
     config.virtualFile = {}
+  if (!config.paths)
+    config.paths = {}
 
   if (!process.env.PS_HMR_BAN) {
     chokidar.watch(configPath, { persistent: true }).on('change', () => {
@@ -127,13 +145,20 @@ export const resolve = async (specifier, context, nextResolve) => {
   }
   // entrypoint
   if (!context.parentURL) {
-    entryUrl = specifier
-    return {
-      format: EXTENSIONS.some(ext => specifier.endsWith(ext))
-        ? 'ts'
-        : undefined,
-      url: specifier,
-      shortCircuit: true,
+    if (/^file:\/\/\//.test(specifier) && existsSync(fileURLToPath(specifier))) {
+      entryUrl = specifier
+
+      return {
+        format: EXTENSIONS.some(ext => specifier.endsWith(ext))
+          ? 'ts'
+          : undefined,
+        url: specifier,
+        shortCircuit: true,
+      }
+    }
+    else {
+      // won't resolve virtual file as entry in vite
+      return nextResolve(specifier)
     }
   }
   // url import
@@ -289,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, '/')
+}