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

package/dist/test.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkVBYDVWRKjs = require('./chunk-VBYDVWRK.js');
+var _chunkFMPVMJLEjs = require('./chunk-FMPVMJLE.js');
 
 
 var _chunkXHKBG2VAjs = require('./chunk-XHKBG2VA.js');
@@ -8,7 +8,7 @@ var _chunkXHKBG2VAjs = require('./chunk-XHKBG2VA.js');
 // src/test.ts
 var _phecdacore = require('phecda-core');
 async function TestFactory(...Modules) {
-  const { moduleMap, constructorMap } = await _chunkVBYDVWRKjs.Factory.call(void 0, Modules);
+  const { moduleMap, constructorMap } = await _chunkFMPVMJLEjs.Factory.call(void 0, Modules);
   return {
     get(Module) {
       const tag = _phecdacore.getTag.call(void 0, Module);

package/dist/test.mjs

@@ -1,6 +1,6 @@
 import {
   Factory
-} from "./chunk-LSMNOIFA.mjs";
+} from "./chunk-TCW7B6MG.mjs";
 import {
   __name
 } from "./chunk-UFSW7A6B.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "5.0.0-beta.19",
+  "version": "5.0.0-beta.21",
   "description": "provide express middlewares, `nestjs` format",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -103,6 +103,7 @@
     "amqplib": "^0.10.3",
     "chokidar": "^3.5.3",
     "express": "^4.18.2",
+    "fast-glob": "^3.3.2",
     "fastify": "^4.25.1",
     "h3": "^1.9.0",
     "ioredis": "^5.3.2",
@@ -121,7 +122,7 @@
     "debug": "^4.3.4",
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
-    "phecda-core": "3.0.0-beta.13"
+    "phecda-core": "3.0.0-beta.14"
   },
   "scripts": {
     "dev": "tsup --watch",

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 _
+  })
+}

package/dist/core-eb2a0799.d.ts

@@ -1,131 +0,0 @@
-import { Events, Construct } from 'phecda-core';
-import { IncomingHttpHeaders } from 'node:http';
-
-declare class Exception extends Error {
-    message: string;
-    status: number;
-    description: string;
-    constructor(message: string, status: number, description?: string);
-    get data(): {
-        message: string;
-        description: string;
-        status: number;
-        __PS_ERROR__: boolean;
-    };
-}
-
-declare const MERGE_SYMBOL = "__PS_MERGE__";
-declare const UNMOUNT_SYMBOL = "__PS_UNMOUNT__";
-declare const MODULE_SYMBOL = "__PS_MODULE__";
-declare const META_SYMBOL = "__PS_META__";
-declare const APP_SYMBOL = "__PS__";
-declare const IS_DEV: boolean;
-declare const IS_STRICT: boolean;
-declare const IS_LOG_BAN: boolean;
-declare const ERROR_SYMBOL = "__PS_ERROR__";
-declare const PS_FILE_RE: RegExp;
-declare const PS_IMPORT_RE: RegExp;
-
-declare class Meta {
-    data: P.MetaData;
-    paramsType: any[];
-    constructor(data: P.MetaData, paramsType: any[]);
-}
-
-interface Emitter {
-    on<N extends keyof Events>(eventName: N, cb: (args: Events[N]) => void): void;
-    once<N extends keyof Events>(eventName: N, cb: (args: Events[N]) => void): void;
-    off<N extends keyof Events>(eventName: N, cb: (args: Events[N]) => void): void;
-    removeAllListeners<N extends keyof Events>(eventName: N): void;
-    emit<N extends keyof Events>(eventName: N, param: Events[N]): void;
-}
-type ToControllerMap<T = any> = {
-    [K in keyof T]: T[K] extends (new (...args: any) => any) ? PickFunc<InstanceType<T[K]>> : void;
-};
-type PickKeysByValue<Type, Value> = {
-    [Key in keyof Type]: Type[Key] extends Value ? Key : never;
-}[keyof Type];
-type PickFunc<T> = Pick<T, PickKeysByValue<T, (...args: any) => any>>;
-type RequestType = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';
-declare namespace P {
-    interface BaseContext {
-        meta: Meta;
-        moduleMap: Record<string, any>;
-        parallel?: boolean;
-        type: string;
-        tag: string;
-        [key: string]: any;
-    }
-    interface HttpContext extends BaseContext {
-        query: Record<string, any>;
-        params: Record<string, string>;
-        body: Record<string, any>;
-        headers: IncomingHttpHeaders;
-        index?: number;
-    }
-    interface Error {
-        [ERROR_SYMBOL]: true;
-        status: number;
-        message: string;
-        description: string;
-    }
-    type ResOrErr<R> = {
-        [K in keyof R]: Awaited<R[K]> | Error;
-    };
-    type Res<T> = T extends {
-        toJSON(): infer R;
-    } ? R : T;
-    type Guard<C extends BaseContext = any> = ((ctx: C) => Promise<boolean> | boolean);
-    type Interceptor<C extends BaseContext = any> = (ctx: C) => (any | ((ret: any) => any));
-    type Pipe<C extends BaseContext = any> = (arg: {
-        arg: any;
-        option?: any;
-        key: string;
-        type: string;
-        index: number;
-        reflect: any;
-    }, ctx: C) => Promise<any>;
-    type Filter<C extends BaseContext = any, E extends Exception = any> = (err: E | Error, ctx?: C) => Error | any;
-    interface MetaData {
-        http?: {
-            type: RequestType;
-            route: string;
-        };
-        rpc?: {
-            type: string[];
-            isEvent: boolean;
-        };
-        define?: any;
-        header: Record<string, string>;
-        params: {
-            type: string;
-            index: number;
-            key: string;
-            pipe?: string;
-            pipeOpts?: any;
-        }[];
-        guards: string[];
-        filter?: string;
-        interceptors: string[];
-        plugins: string[];
-        method: string;
-        name: string;
-        tag: PropertyKey;
-    }
-}
-
-declare function Injectable(): (target: any) => void;
-declare const emitter: Emitter;
-declare function Factory(Modules: (new (...args: any) => any)[], opts?: {
-    http?: string;
-    rpc?: string;
-}): Promise<{
-    moduleMap: Map<PropertyKey, any>;
-    meta: Meta[];
-    constructorMap: Map<any, any>;
-    add: (Module: Construct) => Promise<void>;
-    del: (tag: PropertyKey) => Promise<any>;
-    destroy: () => Promise<void>;
-}>;
-
-export { APP_SYMBOL as A, Exception as E, Factory as F, Injectable as I, Meta as M, P, RequestType as R, ToControllerMap as T, UNMOUNT_SYMBOL as U, Emitter as a, PickKeysByValue as b, PickFunc as c, MERGE_SYMBOL as d, emitter as e, MODULE_SYMBOL as f, META_SYMBOL as g, IS_DEV as h, IS_STRICT as i, IS_LOG_BAN as j, ERROR_SYMBOL as k, PS_FILE_RE as l, PS_IMPORT_RE as m };