phecda-server 5.0.0-beta.20 → 5.0.0-beta.21

package/register/loader.mjs

@@ -1,11 +1,10 @@
 import { fileURLToPath, pathToFileURL } from 'url'
-import { existsSync } from 'fs'
 import { writeFile } from 'fs/promises'
 import { extname, isAbsolute, relative } from 'path'
 import ts from 'typescript'
 import chokidar from 'chokidar'
 import { PS_FILE_RE, log } from '../dist/index.mjs'
-import { compile, genUnImportRet } from './utils.mjs'
+import { compile, genUnImportRet, handleClassTypes } from './utils.mjs'
 let port
 const isLowVersion = parseFloat(process.version.slice(1)) < 18.18
 // this part is important or not?
@@ -35,15 +34,14 @@ export async function initialize(data) {
   if (data)
     port = data.port
 
-  if (process.env.PS_NO_DTS)
+  if (process.env.PS_UNIMPORT_BAN)
     return
 
   unimportRet = await genUnImportRet()
 
   if (unimportRet) {
     log('auto import...')
-    if (!existsSync(dtsPath))
-      writeFile(dtsPath, await unimportRet.generateTypeDeclarations())
+    writeFile(dtsPath, handleClassTypes(await unimportRet.generateTypeDeclarations()))
   }
 }
 

package/register/utils.mjs

@@ -1,3 +1,4 @@
+import { isAbsolute } from 'path'
 import { transform } from '@swc-node/core'
 const injectInlineSourceMap = ({ code, map }) => {
   if (map) {
@@ -18,7 +19,6 @@ export async function compile(sourcecode, filename) {
     emitDecoratorMetadata: true,
     experimentalDecorators: true,
     esModuleInterop: false,
-
   })
 
   return injectInlineSourceMap({ code, map })
@@ -26,16 +26,57 @@ export async function compile(sourcecode, filename) {
 
 export async function genUnImportRet() {
   try {
-    const allExports = Object.keys(await import('../dist/index.mjs'))
+    const psExports = Object.keys(await import('../dist/index.mjs'))
     const { createUnimport } = await import('unimport')
 
+    const workspaceExports = await findWorkspaceExports()
     return createUnimport({
-      imports: allExports.map((k) => {
-        return { name: k, from: 'phecda-server' }
-      }),
+      imports: psExports
+        .map((k) => {
+          return { name: k, from: 'phecda-server' }
+        })
+        .concat(workspaceExports),
     })
   }
   catch (e) {
     return false
   }
 }
+
+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))
+      return `${_}\n  type ${n} = InstanceType<typeof import('${p}')['${e}']>`
+
+    return _
+  })
+}