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

package/register/loader.mjs

@@ -2,26 +2,57 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import { writeFile } from 'fs/promises'
 import {
   basename,
-  extname,
+  dirname,
   isAbsolute,
   relative,
   resolve as resolvePath,
 } from 'path'
+import { existsSync } from 'fs'
 import { createRequire } from 'module'
 import ts from 'typescript'
 import chokidar from 'chokidar'
-import { log } from '../dist/index.mjs'
+import Debug from 'debug'
 import { compile, genUnImportRet, handleClassTypes, slash } from './utils.mjs'
 
-let port
+const require = createRequire(import.meta.url)
+const debug = Debug('phecda-server/loader')
 
 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 = {
+const IS_DEV = process.env.NODE_ENV === 'development'
+let port
+let config
+const workdir = process.cwd()
+const configPath = resolvePath(
+  workdir,
+  process.env.PS_CONFIG_FILE || 'ps.json',
+)
+
+// unimport
+let unimportRet
+const dtsPath = process.env.PS_DTS_PATH || 'ps.d.ts'
+
+// graph
+let entryUrl
+const watchFiles = new Set()
+const filesRecord = new Map()
+const moduleGraph = {}
+// ts
+let tsconfig = {
   module: ts.ModuleKind.ESNext,
   moduleResolution: ts.ModuleResolutionKind.NodeNext,
 }
+const EXTENSIONS = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts]
+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,
@@ -32,32 +63,32 @@ const host = {
   readFile: ts.sys.readFile,
 }
 
-let unimportRet
-const dtsPath = 'ps.d.ts'
-
 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...')
+
+  debug('read 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)
+    config.paths = {}
 
-  if (!process.env.PS_HMR_BAN) {
+  if (IS_DEV) {
     chokidar.watch(configPath, { persistent: true }).on('change', () => {
       port.postMessage(
         JSON.stringify({
@@ -71,17 +102,18 @@ export async function initialize(data) {
     return
   unimportRet = await genUnImportRet(config.unimport)
   if (unimportRet) {
-    log('auto import...')
+    debug('auto import...')
     await unimportRet.init()
 
+    const unimportDtsPath = resolvePath(workdir, dtsPath)
     writeFile(
-      resolvePath(workdir, config.unimport.dtsPath || dtsPath),
+      unimportDtsPath,
       handleClassTypes(
         await unimportRet.generateTypeDeclarations({
           resolvePath: (i) => {
             if (i.from.startsWith('.') || isAbsolute(i.from)) {
               const related = slash(
-                relative(workdir, i.from).replace(/\.ts(x)?$/, ''),
+                relative(dirname(unimportDtsPath), i.from).replace(/\.ts(x)?$/, ''),
               )
 
               return !related.startsWith('.') ? `./${related}` : related
@@ -94,12 +126,6 @@ export async function initialize(data) {
   }
 }
 
-const watchFiles = new Set()
-const filesRecord = new Map()
-const moduleGraph = {}
-
-let entryUrl
-
 function addUrlToGraph(url, parent) {
   if (!(url in moduleGraph))
     moduleGraph[url] = new Set()
@@ -127,25 +153,33 @@ 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
   // 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 (
@@ -169,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/')
@@ -202,6 +236,7 @@ export const resolve = async (specifier, context, nextResolve) => {
     }
   }
 
+
   const resolveRet = await nextResolve(specifier)
 
   // ts resolve fail in some cases
@@ -213,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',
@@ -221,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/')
@@ -229,32 +275,17 @@ export const load = async (url, context, nextLoad) => {
     && !isLowVersion
   ) {
     watchFiles.add(url)
-    // watch(
-    //   fileURLToPath(url),
-    //   debounce((type) => {
-    //     if (type === 'change') {
-    //       try {
-    //         const files = [...findTopScope(url, Date.now())].reverse()
-
-    //         port.postMessage(
-    //           JSON.stringify({
-    //             type: 'change',
-    //             files,
-    //           }),
-    //         )
-    //       }
-    //       catch (e) {
-    //         port.postMessage(
-    //           JSON.stringify({
-    //             type: 'relaunch',
-    //           }),
-    //         )
-    //       }
-    //     }
-    //   }),
-    // )
-
-    if (!process.env.PS_HMR_BAN) {
+
+    if (IS_DEV && mode !== 'not-hmr') {
+      if (isModuleFileUrl(url)) {
+        port.postMessage(
+          JSON.stringify({
+            type: 'init',
+            files: [fileURLToPath(url)],
+          }),
+        )
+      }
+
       chokidar.watch(fileURLToPath(url), { persistent: true }).on(
         'change',
         debounce(() => {
@@ -289,9 +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)
+
+    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: (
@@ -357,7 +393,7 @@ export function isModuleFileUrl(url) {
       'addon',
       'filter',
       'pipe',
-      'edge',
+      'solo',
     ].includes(midName)
   )
     return true

package/register/utils.mjs

@@ -1,56 +1,86 @@
-import { basename } from 'path'
-import { transform } from '@swc-node/core'
-const injectInlineSourceMap = ({ code, map }) => {
-  if (map) {
-    const base64Map = Buffer.from(map, 'utf8').toString('base64')
-    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
-    return `${code}\n${sourceMapContent}`
-  }
-  return code
-}
-
-export async function compile(sourcecode, filename) {
-  if (filename.endsWith('.d.ts'))
-    return ''
-
-  const { code, map } = await transform(sourcecode, filename, {
-    sourcemap: true,
-    module: 'es6',
-    emitDecoratorMetadata: true,
-    experimentalDecorators: true,
-    esModuleInterop: false,
-  })
-
-  return injectInlineSourceMap({ code, map })
-}
-
-export async function genUnImportRet(opts) {
-  try {
-    const psExports = Object.keys(await import('../dist/index.mjs'))
-    const { createUnimport } = await import('unimport')
-    return createUnimport({
-      ...opts,
-      imports: psExports
-        .map((k) => {
-          return { name: k, from: 'phecda-server' }
-        })
-        .concat(opts.imports || []),
-    })
-  }
-  catch (e) {
-    return false
-  }
-}
-
-export function handleClassTypes(input) {
-  return input.replace(/const\s+(\w+)\s*:\s*typeof\s+import\(['"](.+)['"]\)\['(\w+)'\]/g, (_, n, p, e) => {
-    // 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, '/')
-}
+import { basename } from 'path'
+import { transform } from '@swc-node/core'
+import psExports from './export.mjs'
+const injectInlineSourceMap = ({ code, map }) => {
+  if (map) {
+    const base64Map = Buffer.from(map, 'utf8').toString('base64')
+    const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`
+    return `${code}\n${sourceMapContent}`
+  }
+  return code
+}
+
+export async function compile(sourcecode, filename) {
+  if (filename.endsWith('.d.ts'))
+    return ''
+
+  const { code, map } = await transform(sourcecode, filename, {
+    sourcemap: true,
+    module: 'es6',
+    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 })
+}
+
+export async function genUnImportRet(opts) {
+  try {
+    const { createUnimport } = await import('unimport')
+    return createUnimport({
+      ...opts,
+
+      presets: [
+        {
+          from: 'phecda-server',
+          imports: psExports,
+        },
+      ]
+        .concat(opts.presets || []),
+    })
+  }
+  catch (e) {
+    console.error(e)
+    return false
+  }
+}
+
+export function handleClassTypes(input) {
+  return input.replace(/const\s+(\w+)\s*:\s*typeof\s+import\(['"](.+)['"]\)\['(\w+)'\]/g, (_, n, p, e) => {
+    // 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, '/')
+}

package/dist/chunk-J5CFUN4V.js

@@ -1,73 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
-// src/common.ts
-var ERROR_SYMBOL = "__PS_ERROR__";
-var IS_HMR = process.env.NODE_ENV === "development";
-var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
-var IS_STRICT = !!process.env.PS_STRICT;
-var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
-var PS_EXIT_CODE;
-(function(PS_EXIT_CODE2) {
-  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 2] = "RELAUNCH";
-  PS_EXIT_CODE2[PS_EXIT_CODE2["CODE"] = 4] = "CODE";
-})(PS_EXIT_CODE || (PS_EXIT_CODE = exports.PS_EXIT_CODE = {}));
-
-// src/utils.ts
-var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
-var _tsmixer = require('ts-mixer');
-var time;
-var internalLogger;
-function setLogger(logger) {
-  internalLogger = logger;
-}
-__name(setLogger, "setLogger");
-function getLogger() {
-  return internalLogger;
-}
-__name(getLogger, "getLogger");
-function log(msg, level = "log") {
-  if (internalLogger) internalLogger[level](msg);
-  const logLevel = {
-    debug: -1,
-    info: 0,
-    log: 1,
-    warn: 2,
-    error: 3
-  }[level];
-  if (logLevel < LOG_LEVEL) return;
-  const color = {
-    debug: "bgMagenta",
-    error: "red",
-    info: "gray",
-    warn: "yellow",
-    log: "green"
-  }[level];
-  const date = /* @__PURE__ */ new Date();
-  const current = Date.now();
-  const interval = time && current - time ? `+${current - time}` : "";
-  time = current;
-  console[level](`${_picocolors2.default.magenta("[phecda-server]")} ${_picocolors2.default.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${_picocolors2.default[color](msg)} ${_picocolors2.default.gray(interval)}`);
-}
-__name(log, "log");
-function runMiddleware(ctx, middleware) {
-  return new Promise((resolve) => {
-    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
-  });
-}
-__name(runMiddleware, "runMiddleware");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-exports.__name = __name; exports.ERROR_SYMBOL = ERROR_SYMBOL; exports.IS_HMR = IS_HMR; exports.IS_ONLY_GENERATE = IS_ONLY_GENERATE; exports.IS_STRICT = IS_STRICT; exports.LOG_LEVEL = LOG_LEVEL; exports.PS_EXIT_CODE = PS_EXIT_CODE; exports.setLogger = setLogger; exports.getLogger = getLogger; exports.log = log; exports.runMiddleware = runMiddleware; exports.Mixin = _tsmixer.Mixin;

package/dist/chunk-WHJ5FALK.mjs

@@ -1,73 +0,0 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
-// src/common.ts
-var ERROR_SYMBOL = "__PS_ERROR__";
-var IS_HMR = process.env.NODE_ENV === "development";
-var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
-var IS_STRICT = !!process.env.PS_STRICT;
-var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
-var PS_EXIT_CODE;
-(function(PS_EXIT_CODE2) {
-  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 2] = "RELAUNCH";
-  PS_EXIT_CODE2[PS_EXIT_CODE2["CODE"] = 4] = "CODE";
-})(PS_EXIT_CODE || (PS_EXIT_CODE = {}));
-
-// src/utils.ts
-import pc from "picocolors";
-import { Mixin } from "ts-mixer";
-var time;
-var internalLogger;
-function setLogger(logger) {
-  internalLogger = logger;
-}
-__name(setLogger, "setLogger");
-function getLogger() {
-  return internalLogger;
-}
-__name(getLogger, "getLogger");
-function log(msg, level = "log") {
-  if (internalLogger) internalLogger[level](msg);
-  const logLevel = {
-    debug: -1,
-    info: 0,
-    log: 1,
-    warn: 2,
-    error: 3
-  }[level];
-  if (logLevel < LOG_LEVEL) return;
-  const color = {
-    debug: "bgMagenta",
-    error: "red",
-    info: "gray",
-    warn: "yellow",
-    log: "green"
-  }[level];
-  const date = /* @__PURE__ */ new Date();
-  const current = Date.now();
-  const interval = time && current - time ? `+${current - time}` : "";
-  time = current;
-  console[level](`${pc.magenta("[phecda-server]")} ${pc.gray(`${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`)} ${pc[color](msg)} ${pc.gray(interval)}`);
-}
-__name(log, "log");
-function runMiddleware(ctx, middleware) {
-  return new Promise((resolve) => {
-    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
-  });
-}
-__name(runMiddleware, "runMiddleware");
-
-export {
-  __name,
-  ERROR_SYMBOL,
-  IS_HMR,
-  IS_ONLY_GENERATE,
-  IS_STRICT,
-  LOG_LEVEL,
-  PS_EXIT_CODE,
-  setLogger,
-  getLogger,
-  log,
-  runMiddleware,
-  Mixin
-};