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

package/assets/schema.json

@@ -1,55 +1,55 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "resolve": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "source": {
-            "type": "string",
-            "description": "The middle name of the imported file."
-          },
-          "importer": {
-            "type": "string",
-            "description": "The middle name of the importer file."
-          },
-          "path": {
-            "type": "string",
-
-            "description": "Redirect path"
-          },
-          "filename": {
-            "type": "string",
-            "optional": true,
-
-            "description": "generate split chunk,only work in vite"
-          }
-        },
-        "required": ["source", "path", "importer"]
-      },
-      "description": "Resolve and redirect modules path"
-    },
-    "moduleFile": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Including the module's file middle name, such as controller mapping to xx.controller.ts"
-    },
-    "virtualFile": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
-      "description": "Virtual module, just like in Vite."
-    },
-    "unimport": {
-      "type": "object",
-      "description": "Includes the arguments passed to unimport and 'dtsPath' that specifies the location for generating type files."
-    }
-  },
-
-  "required": ["resolve"]
-}
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "resolve": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "source": {
+            "type": "string",
+            "description": "The middle name of the imported file."
+          },
+          "importer": {
+            "type": "string",
+            "description": "The middle name of the importer file."
+          },
+          "path": {
+            "type": "string",
+
+            "description": "Redirect path"
+          },
+          "filename": {
+            "type": "string",
+            "optional": true,
+
+            "description": "generate split chunk,only work in vite"
+          }
+        },
+        "required": ["source", "path", "importer"]
+      },
+      "description": "Resolve and redirect modules path"
+    },
+    "moduleFile": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Including the module's file middle name, such as controller mapping to xx.controller.ts"
+    },
+    "virtualFile": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      },
+      "description": "Virtual module, just like in Vite."
+    },
+    "unimport": {
+      "type": "object",
+      "description": "Includes the arguments passed to unimport and 'dtsPath' that specifies the location for generating type files."
+    }
+  },
+
+  "required": ["resolve"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-server",
-  "version": "7.0.0-alpha.3",
+  "version": "7.0.0-alpha.4",
   "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