phecda-server 5.1.1 → 5.2.1

package/package.json

@@ -1,74 +1,84 @@
 {
   "name": "phecda-server",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "bin": {
-    "phecda": "bin/cli.mjs"
-  },
+  "author": "fgsreally",
+  "license": "MIT",
+  "repository": "https://github.com/fgsreally/phecda/tree/main/packages/server",
+  "keywords": [
+    "server",
+    "IOC",
+    "rpc",
+    "types-share"
+  ],
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
       "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
       "node": "./dist/index.js"
     },
+    "./helper": {
+      "require": "./dist/helper.js",
+      "import": "./dist/helper.mjs"
+    },
     "./test": {
-      "import": "./dist/test.mjs",
-      "require": "./dist/test.js"
+      "require": "./dist/test.js",
+      "import": "./dist/test.mjs"
     },
     "./h3": {
-      "import": "./dist/server/h3/index.mjs",
-      "require": "./dist/server/h3/index.js"
+      "require": "./dist/server/h3/index.js",
+      "import": "./dist/server/h3/index.mjs"
     },
     "./express": {
-      "import": "./dist/server/express/index.mjs",
-      "require": "./dist/server/express/index.js"
+      "require": "./dist/server/express/index.js",
+      "import": "./dist/server/express/index.mjs"
     },
     "./koa": {
-      "import": "./dist/server/koa/index.mjs",
-      "require": "./dist/server/koa/index.js"
+      "require": "./dist/server/koa/index.js",
+      "import": "./dist/server/koa/index.mjs"
     },
     "./fastify": {
-      "import": "./dist/server/fastify/index.mjs",
-      "require": "./dist/server/fastify/index.js"
+      "require": "./dist/server/fastify/index.js",
+      "import": "./dist/server/fastify/index.mjs"
     },
     "./hyper-express": {
-      "import": "./dist/server/hyper-express/index.mjs",
-      "require": "./dist/server/hyper-express/index.js"
+      "require": "./dist/server/hyper-express/index.js",
+      "import": "./dist/server/hyper-express/index.mjs"
     },
     "./hono": {
-      "import": "./dist/server/hono/index.mjs",
-      "require": "./dist/server/hono/index.js"
+      "require": "./dist/server/hono/index.js",
+      "import": "./dist/server/hono/index.mjs"
     },
     "./elysia": {
-      "import": "./dist/server/elysia/index.mjs",
-      "require": "./dist/server/elysia/index.js"
+      "require": "./dist/server/elysia/index.js",
+      "import": "./dist/server/elysia/index.mjs"
     },
     "./redis": {
-      "import": "./dist/rpc/redis/index.mjs",
-      "require": "./dist/rpc/redis/index.js"
+      "require": "./dist/rpc/redis/index.js",
+      "import": "./dist/rpc/redis/index.mjs"
     },
     "./kafka": {
-      "import": "./dist/rpc/kafka/index.mjs",
-      "require": "./dist/rpc/kafka/index.js"
+      "require": "./dist/rpc/kafka/index.js",
+      "import": "./dist/rpc/kafka/index.mjs"
     },
     "./rabbitmq": {
-      "import": "./dist/rpc/rabbitmq/index.mjs",
-      "require": "./dist/rpc/rabbitmq/index.js"
+      "require": "./dist/rpc/rabbitmq/index.js",
+      "import": "./dist/rpc/rabbitmq/index.mjs"
     },
     "./bullmq": {
-      "import": "./dist/rpc/bullmq/index.mjs",
-      "require": "./dist/rpc/bullmq/index.js"
+      "require": "./dist/rpc/bullmq/index.js",
+      "import": "./dist/rpc/bullmq/index.mjs"
     },
     "./nats": {
-      "import": "./dist/rpc/nats/index.mjs",
-      "require": "./dist/rpc/nats/index.js"
+      "require": "./dist/rpc/nats/index.js",
+      "import": "./dist/rpc/nats/index.mjs"
     },
     "./register": "./register/index.mjs",
     "./*": "./*"
   },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "typesVersions": {
     "*": {
       ".": [
@@ -77,6 +87,9 @@
       "test": [
         "dist/test.d.ts"
       ],
+      "helper": [
+        "dist/helper.d.ts"
+      ],
       "h3": [
         "dist/server/h3/index.d.ts"
       ],
@@ -115,20 +128,25 @@
       ]
     }
   },
-  "keywords": [
-    "server",
-    "IOC",
-    "rpc",
-    "types-share"
-  ],
-  "author": "fgsreally",
-  "repository": "https://github.com/fgsreally/phecda/tree/main/packages/server",
+  "bin": {
+    "phecda": "bin/cli.mjs"
+  },
   "files": [
     "dist",
+    "assets",
     "register",
     "bin"
   ],
-  "license": "MIT",
+  "dependencies": {
+    "@swc-node/core": "^1.10.6",
+    "cac": "^6.7.14",
+    "chokidar": "^3.5.3",
+    "debug": "^4.3.4",
+    "fs-extra": "^11.2.0",
+    "picocolors": "^1.0.0",
+    "reflect-metadata": "^0.1.13",
+    "phecda-core": "3.0.0"
+  },
   "devDependencies": {
     "@koa/router": "^12.0.1",
     "@nucleoidjs/kafkajs-mock": "^0.0.1",
@@ -159,16 +177,6 @@
     "typescript": "^5.4.5",
     "unimport": "^3.7.1"
   },
-  "dependencies": {
-    "@swc-node/core": "^1.10.6",
-    "cac": "^6.7.14",
-    "chokidar": "^3.5.3",
-    "debug": "^4.3.4",
-    "fs-extra": "^11.2.0",
-    "picocolors": "^1.0.0",
-    "reflect-metadata": "^0.1.13",
-    "phecda-core": "3.0.0"
-  },
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup"

package/register/loader.mjs

@@ -11,7 +11,7 @@ import { createRequire } from 'module'
 import ts from 'typescript'
 import chokidar from 'chokidar'
 import { log } from '../dist/index.mjs'
-import { compile, genUnImportRet, handleClassTypes } from './utils.mjs'
+import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
 let port
 
@@ -39,17 +39,20 @@ if (isLowVersion)
   await initialize()
 
 let config
+
+const workdir = process.env.PS_WORKDIR || process.cwd()
+
+const configPath = resolvePath(
+  workdir,
+  process.env.PS_CONFIG_FILE || 'ps.json',
+)
+
 const require = createRequire(import.meta.url)
 export async function initialize(data) {
   if (data)
     port = data.port
   log('read config...')
 
-  const configPath = resolvePath(
-    process.cwd(),
-    process.env.PS_CONFIG_FILE || 'ps.json',
-  )
-
   config = require(configPath)
   if (!config.virtualFile)
     config.virtualFile = {}
@@ -72,8 +75,21 @@ export async function initialize(data) {
     await unimportRet.init()
 
     writeFile(
-      config.unimport.dtsPath || dtsPath,
-      handleClassTypes(await unimportRet.generateTypeDeclarations()),
+      resolvePath(workdir, config.unimport.dtsPath || dtsPath),
+      handleClassTypes(
+        await unimportRet.generateTypeDeclarations({
+          resolvePath: (i) => {
+            if (i.from.startsWith('.') || isAbsolute(i.from)) {
+              const related = slash(
+                relative(workdir, i.from).replace(/\.ts(x)?$/, ''),
+              )
+
+              return !related.startsWith('.') ? `./${related}` : related
+            }
+            return i.from
+          },
+        }),
+      ),
     )
   }
 }
@@ -173,7 +189,7 @@ export const resolve = async (specifier, context, nextResolve) => {
       if (resolver) {
         return {
           format: 'ts',
-          url: pathToFileURL(resolvePath(process.cwd(), resolver.path)).href,
+          url: pathToFileURL(resolvePath(workdir, resolver.path)).href,
           shortCircuit: true,
         }
       }
@@ -281,10 +297,7 @@ export const load = async (url, context, nextLoad) => {
         source: (
           await injectImports(
             compiled,
-            (url.startsWith('file://') ? fileURLToPath(url) : url).replace(
-              /\\/g,
-              '/',
-            ),
+            slash(url.startsWith('file://') ? fileURLToPath(url) : url),
           )
         ).code,
         shortCircuit: true,

package/register/utils.mjs

@@ -1,4 +1,4 @@
-import { isAbsolute } from 'path'
+import { basename } from 'path'
 import { transform } from '@swc-node/core'
 const injectInlineSourceMap = ({ code, map }) => {
   if (map) {
@@ -42,40 +42,15 @@ export async function genUnImportRet(opts) {
   }
 }
 
-// function slash(str) {
-//   return str.replace(/\\/g, '/')
-// }
-
-// async function findWorkspaceExports() {
-//   try {
-//     const { default: fg } = await import('fast-glob')
-//     const { scanExports } = await import('unimport')
-//     const result = await fg(
-//       '**/*.@(controller|service|module|extension|ext|guard|interceptor|plugin|filter|pipe|edge).ts',
-//       {
-//         ignore: ['node_modules'],
-//         absolute: true,
-//         cwd: process.cwd(),
-//         onlyFiles: true,
-//         followSymbolicLinks: true,
-//       },
-//     )
-
-//     const files = Array.from(new Set(result.flat())).map(slash)
-
-//     return (await Promise.all(files.map(i => scanExports(i, false))))
-//       .flat()
-//   }
-//   catch (e) {
-//     return []
-//   }
-// }
-
 export function handleClassTypes(input) {
   return input.replace(/const\s+(\w+)\s*:\s*typeof\s+import\(['"](.+)['"]\)\['(\w+)'\]/g, (_, n, p, e) => {
-    if (isAbsolute(p))
+    // 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, '/')
+}