phecda-server 7.0.0-alpha.10 → 7.0.0-alpha.11

package/bin/cli.mjs

@@ -88,7 +88,7 @@ cli
       process.chdir(root)
 
     const tsconfigPath = options.tsconfig
-    const psconfigPath = options.config
+    const psconfigPath = process.env.PS_CONFIG_FILE || options.config
 
     if (!fse.existsSync(tsconfigPath)) {
       log(`create ${tsconfigPath}`)
@@ -124,7 +124,7 @@ cli
     else
       process.env.NODE_ENV = 'development'
 
-    process.env.PS_CONFIG_FILE = options.config
+    process.env.PS_CONFIG_FILE = process.env.PS_CONFIG_FILE || options.config
 
     log('process start!')
 
@@ -164,7 +164,7 @@ cli
     if (root)
       process.chdir(root)
     process.env.PS_GENERATE = 'true'
-    process.env.PS_CONFIG_FILE = options.config
+    process.env.PS_CONFIG_FILE = process.env.PS_CONFIG_FILE || options.config
     startChild(file, options['--'])
   })
 

package/dist/test.d.mts

@@ -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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "set" | "key" | "use" | "on" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/dist/test.d.ts

@@ -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, "use" | "on" | "set" | "query" | "type" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "key" | "pfx" | "cert"> & {
+declare function TestHttp(app: Server | any, { moduleMap, meta }: Awaited<ReturnType<typeof Factory>>, isAgent?: boolean): Promise<supertest.SuperTestWithHost<Test> & Pick<supertest.Request, "type" | "query" | "set" | "key" | "use" | "on" | "accept" | "auth" | "withCredentials" | "retry" | "ok" | "redirects" | "timeout" | "buffer" | "serialize" | "parse" | "ca" | "pfx" | "cert"> & {
     module: <T extends Construct>(Module: T) => SuperTestRequest<PickFunc<InstanceType<T>>>;
 }>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.10",
+  "version": "7.0.0-alpha.11",
   "description": "server framework that provide IOC/type-reuse/http&rpc-adaptor",
   "author": "fgsreally",
   "license": "MIT",
@@ -148,7 +148,6 @@
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "ts-mixer": "^6.0.4",
-    "unconfig": "^0.6.0",
     "phecda-core": "4.1.0-alpha.0"
   },
   "devDependencies": {
@@ -178,7 +177,7 @@
     "nats": "^2.22.0",
     "supertest": "^6.3.3",
     "tsup": "^8.1.0",
-    "typescript": "^5.4.5",
+    "typescript": "^5.7.2",
     "unimport": "^3.7.1"
   },
   "scripts": {

package/register/loader.mjs

@@ -3,18 +3,18 @@ import { writeFile } from 'fs/promises'
 import {
   basename,
   dirname,
-  extname,
   isAbsolute,
   relative,
   resolve as resolvePath,
 } from 'path'
 import { existsSync } from 'fs'
+import { createRequire } from 'module'
 import ts from 'typescript'
 import chokidar from 'chokidar'
 import Debug from 'debug'
-import { loadConfig } from 'unconfig'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
+const require = createRequire(import.meta.url)
 const debug = Debug('phecda-server/loader')
 
 const isLowVersion = parseFloat(process.version.slice(1)) < 18.19
@@ -72,16 +72,17 @@ export async function initialize(data) {
 
   debug('read config...')
 
-  const unconfigRet = await loadConfig({
-    sources: [
-      {
-        files: configPath,
-        extensions: ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs', 'json', ''],
-      },
-    ],
-    merge: false,
-  })
-  config = unconfigRet.config
+  config = require(configPath)
+  // const unconfigRet = await loadConfig({
+  //   sources: [
+  //     {
+  //       files: configPath,
+  //       extensions: ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs', 'json', ''],
+  //     },
+  //   ],
+  //   merge: false,
+  // })
+  // config = unconfigRet.config
   if (!config.virtualFile)
     config.virtualFile = {}
   if (!config.paths)
@@ -170,14 +171,15 @@ export const resolve = async (specifier, context, nextResolve) => {
   }
   // url import
   // it seems useless
-  if (/^file:\/\/\//.test(specifier) && extname(specifier) === '.ts') {
-    const url = addUrlToGraph(specifier, context.parentURL.split('?')[0])
-    return {
-      format: 'ts',
-      url,
-      shortCircuit: true,
-    }
-  }
+  // if (/^file:\/\/\//.test(specifier) && extname(specifier) === '.ts') {
+  //   const url = addUrlToGraph(specifier, context.parentURL.split('?')[0])
+  //   return {
+  //     format: 'ts',
+  //     url,
+  //     shortCircuit: true,
+  //   }
+  // }
+
 
   // hmr import
   if (
@@ -201,7 +203,7 @@ export const resolve = async (specifier, context, nextResolve) => {
     moduleResolutionCache,
   )
 
-  // import between loacl projects
+  // import among files in local project
   if (
     resolvedModule
     && !resolvedModule.resolvedFileName.includes('/node_modules/')
@@ -234,6 +236,7 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
 
+
   const resolveRet = await nextResolve(specifier)
 
   // ts resolve fail in some cases
@@ -245,6 +248,9 @@ export const resolve = async (specifier, context, nextResolve) => {
 // @todo the first params may be url or path, need to distinguish
 
 export const load = async (url, context, nextLoad) => {
+
+
+
   if (config.virtualFile[url]) {
     return {
       format: 'module',
@@ -253,6 +259,14 @@ export const load = async (url, context, nextLoad) => {
     }
   }
 
+  let mode
+  if (context.importAttributes.ps) {
+    mode = context.importAttributes.ps
+    delete context.importAttributes.ps
+  }
+
+
+
   url = url.split('?')[0]
   if (
     !url.includes('/node_modules/')
@@ -262,7 +276,7 @@ export const load = async (url, context, nextLoad) => {
   ) {
     watchFiles.add(url)
 
-    if (IS_DEV) {
+    if (IS_DEV && mode !== 'not-hmr') {
       if (isModuleFileUrl(url)) {
         port.postMessage(
           JSON.stringify({
@@ -306,10 +320,14 @@ export const load = async (url, context, nextLoad) => {
 
     const code
       = typeof source === 'string' ? source : Buffer.from(source).toString()
+
     const compiled = (await compile(code, url)).replace(/_ts_metadata\(\"design:paramtypes\"\,/g, '_ts_metadata("design:paramtypes",()=>')// handle cycle
 
     if (unimportRet) {
+
+
       const { injectImports } = unimportRet
+
       return {
         format: 'module',
         source: (

package/register/utils.mjs

@@ -20,6 +20,32 @@ export async function compile(sourcecode, filename) {
     emitDecoratorMetadata: true,
     experimentalDecorators: true,
     esModuleInterop: false,
+    swc: {
+
+      jsc: {
+        parser: {
+          syntax: "typescript",
+          importAttributes: true,
+          decorators: true,
+          tsx: false,
+          dynamicImport: true,
+          strictPropertyInitialization: false
+        },
+        experimental: {
+          keepImportAssertions: true
+        },
+        transform: {
+          legacyDecorator: true,
+          decoratorMetadata: true
+        }
+        // parser: {
+        //   importAttributes: true
+        // },
+        // experimental: {
+        //   keepImportAssertions: true
+        // }
+      }
+    }
   })
 
   return injectInlineSourceMap({ code, map })