phecda-server 5.1.0 → 5.2.0

package/README.md

@@ -1,10 +1,10 @@
-# phecda-server
-
-[DOCUMENT](https://fgsreally.github.io/phecda/)
-
-nodejs server framework that provide IOC/type-reuse/http&rpc-adaptor
-
-like `nestjs`+ `trpc`, work with `elysia/express/hono/h3/koa/fastify/hyper-express` and `redis/rabbimq/kafka/bullmq/nats`
-
-Pragmatism , Progressive, Less code and Easy to maintain
-
+# phecda-server
+
+[DOCUMENT](https://fgsreally.github.io/phecda/)
+
+nodejs server framework that provide IOC/type-reuse/http&rpc-adaptor
+
+like `nestjs`+ `trpc`, work with `elysia/express/hono/h3/koa/fastify/hyper-express` and `redis/rabbimq/kafka/bullmq/nats`
+
+Pragmatism , Progressive, Less code and Easy to maintain
+

package/assets/ps.json

@@ -0,0 +1,25 @@
+{
+    "$schema": "https://unpkg.com/phecda-server/bin/schema.json",
+    "resolve": [
+      {
+        "source": "controller",
+        "importer": "http",
+        "path": ".ps/http.js"
+      },
+      {
+        "source": "rpc",
+        "importer": "client",
+        "path": ".ps/rpc.js"
+      }
+    ],
+  "unimport": {
+    "dirs": ["."],
+    "dirsScanOptions":{
+      "filePatterns":["*.{service,controller,module,rpc,edge,guard,interceptor,extension,pipe,filter,plugin}.ts"]
+     }
+   },
+    "virtualFile":{},
+    "moduleFile": []
+    
+  }
+  

package/{bin → 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/assets/tsconfig.json

@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+      "target": "esnext",
+      "useDefineForClassFields": false,
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true,
+      "module": "esnext",
+      "lib": ["esnext", "DOM"],
+      "strictPropertyInitialization": false,
+      "moduleResolution": "Node",
+      "strict": true,
+      "resolveJsonModule": true,
+      "esModuleInterop": true,
+      "noEmit": true,
+      "noUnusedLocals": true,
+      "noUnusedParameters": true,
+      "noImplicitReturns": true,
+      "skipLibCheck": true
+    },
+    "include": [".","./ps.d.ts"]
+  }

package/bin/cli.mjs

@@ -1,189 +1,150 @@
-#! /usr/bin/env node
-import { fork } from 'child_process'
-import { createRequire } from 'module'
-import pc from 'picocolors'
-import cac from 'cac'
-import fse from 'fs-extra'
-import { log } from '../dist/index.mjs'
-const cli = cac('phecda').option('-c,--config <config>', 'config file', {
-  default: 'ps.json',
-})
-const require = createRequire(import.meta.url)
-let child
-
-let closePromise
-const nodeVersion = parseFloat(process.version.slice(1))
-
-if (nodeVersion < 18.19) {
-  log(
-    `Nodejs version less than 18.19(current is ${nodeVersion}) can't support hmr`,
-    'yellow',
-  )
-}
-
-function startChild(file, args) {
-  child = fork(file, {
-    env: { NODE_ENV: 'development', ...process.env },
-    stdio: 'inherit',
-    execArgv: [
-      nodeVersion < 18.19
-        ? '--loader=phecda-server/register/loader.mjs'
-        : '--import=phecda-server/register',
-      ...args,
-    ],
-  })
-
-  closePromise = new Promise((resolve) => {
-    child.once('exit', (code) => {
-      if (code === 4) {
-        log('only generate code')
-        process.exit(0)
-      }
-      if (code >= 2) {
-        // for relaunch
-        log('relaunch...')
-        startChild(file, args)
-      }
-      child = undefined
-
-      resolve()
-    })
-  })
-}
-
-function exit() {
-  log('process exit')
-
-  if (child) {
-    child.kill()
-    process.exit(0)
-  }
-  else {
-    process.exit(0)
-  }
-}
-process.on('SIGINT', () => {
-  process.exit()
-})
-
-cli.command('init', 'init config file').action(async (options) => {
-  if (!fse.existsSync('tsconfig.json')) {
-    log('init tsconfig.json')
-
-    await fse.outputFile(
-      'tsconfig.json',
-    `{
-    "compilerOptions": {
-      "target": "esnext",
-      "useDefineForClassFields": false,
-      "experimentalDecorators": true,
-      "emitDecoratorMetadata": true,
-      "module": "esnext",
-      "lib": ["esnext", "DOM"],
-      "strictPropertyInitialization": false,
-      "moduleResolution": "Node",
-      "strict": true,
-      "resolveJsonModule": true,
-      "esModuleInterop": true,
-      "noEmit": true,
-      "noUnusedLocals": true,
-      "noUnusedParameters": true,
-      "noImplicitReturns": true,
-      "skipLibCheck": true
-    },
-    "include": ["src","./ps.d.ts"]
-  }
-  `,
-    )
-  }
-
-  if (!fse.existsSync(options.config)) {
-    log(`init ${options.config}`)
-
-    await fse.outputFile(
-      options.config,
-     `{
-      "$schema": "node_modules/phecda-server/bin/schema.json",
-      "resolve": [
-        {
-          "source": "controller",
-          "importer": "http",
-          "path": ".ps/http.js"
-        },
-        {
-          "source": "rpc",
-          "importer": "client",
-          "path": ".ps/rpc.js"
-        }
-      ],
-    "unimport": {
-      "dirs": [],
-      "dirsScanOptions":{
-        "filePatterns":["*.{service,controller,module,rpc,edge,guard,interceptor,extension,pipe,filter,plugin}.ts"]
-       }
-     },
-      "virtualFile":{},
-      "moduleFile": []
-      
-    }
-    `,
-    )
-  }
-})
-
-cli
-  .command('[file]', 'run file')
-  .alias('run')
-  .action((file, options) => {
-    process.env.PS_CONFIG_FILE = options.config
-
-    log('process start!')
-
-    startChild(file, options['--'])
-    console.log(`${pc.green('->')} press ${pc.green('e')} to exit`)
-    console.log(`${pc.green('->')} press ${pc.green('r')} to relaunch`)
-
-    process.stdin.on('data', async (data) => {
-      const input = data.toString().trim().toLocaleLowerCase()
-      if (input === 'r') {
-        if (child) {
-          await child.kill()
-          if (closePromise)
-            await closePromise
-          log('relaunch...')
-          startChild(file, options['--'])
-        }
-        else {
-          log('relaunch...')
-
-          startChild(file, options['--'])
-        }
-      }
-      if (input === 'e')
-        exit()
-    })
-  })
-
-cli
-  .command('generate [file]', 'generate code(mainly for ci)')
-  .action((file, options) => {
-    process.env.PS_GENERATE = 'true'
-    process.env.PS_CONFIG_FILE = options.config
-    startChild(file, options['--'])
-  })
-// if (cmd[0] === 'init') {
-
-// }
-// else if (cmd[0] === 'code') {
-//   process.env.PS_GENERATE = 'true'
-//   cmd.splice(0, 1)
-//   startChild(file,options['--'])
-// }
-// else {
-
-// }
-
-cli.help()
-cli.version(require('../package.json').version)
-
-cli.parse()
+#! /usr/bin/env node
+import { fork } from 'child_process'
+import { createRequire } from 'module'
+import { fileURLToPath } from 'url'
+
+import { dirname, join, resolve } from 'path'
+import pc from 'picocolors'
+import cac from 'cac'
+import fse from 'fs-extra'
+import { log } from '../dist/index.mjs'
+
+const cli = cac('phecda')
+  .option('-c,--config <config>', 'config file', {
+    default: 'ps.json',
+  })
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+const require = createRequire(import.meta.url)
+let child
+
+let closePromise
+const nodeVersion = parseFloat(process.version.slice(1))
+
+if (nodeVersion < 18.19) {
+  log(
+    `Nodejs version less than 18.19(current is ${nodeVersion}) can't support hmr`,
+    'yellow',
+  )
+}
+
+function startChild(file, args) {
+  child = fork(file, {
+    env: { NODE_ENV: 'development', ...process.env },
+    stdio: 'inherit',
+    execArgv: [
+      nodeVersion < 18.19
+        ? '--loader=phecda-server/register/loader.mjs'
+        : '--import=phecda-server/register',
+      ...args,
+    ],
+  })
+
+  closePromise = new Promise((resolve) => {
+    child.once('exit', (code) => {
+      if (code === 4) {
+        log('only generate code')
+        process.exit(0)
+      }
+      if (code >= 2) {
+        // for relaunch
+        log('relaunch...')
+        startChild(file, args)
+      }
+      child = undefined
+
+      resolve()
+    })
+  })
+}
+
+function exit() {
+  log('process exit')
+
+  if (child) {
+    child.kill()
+    process.exit(0)
+  }
+  else {
+    process.exit(0)
+  }
+}
+process.on('SIGINT', () => {
+  process.exit()
+})
+
+cli
+  .command('init [workdir]', 'init config file')
+  .allowUnknownOptions()
+  .option('-t,--tsconfig <tsconfig>', 'init tsconfig file', {
+    default: 'tsconfig.json',
+  })
+  .action(async (workdir, options) => {
+    const tsconfigPath = join(workdir, options.tsconfig)
+    const psconfigPath = join(workdir, options.config)
+
+    if (!fse.existsSync(tsconfigPath)) {
+      log(`create ${tsconfigPath}`)
+
+      await fse.copyFile(resolve(__dirname, '../assets/tsconfig.json'), tsconfigPath)
+    }
+
+    if (!fse.existsSync(psconfigPath)) {
+      log(`create ${psconfigPath}`)
+
+      await fse.copyFile(resolve(__dirname, '../assets/ps.json'), psconfigPath)
+    }
+  })
+
+cli
+  .command('<file> [workdir]', 'run file')
+  .allowUnknownOptions()
+  .alias('run')
+  .action((file, workdir, options) => {
+    if (workdir)
+      process.env.PS_WORKDIR = workdir
+    process.env.PS_CONFIG_FILE = options.config
+
+    log('process start!')
+
+    startChild(file, options['--'])
+    console.log(`${pc.green('->')} press ${pc.green('e')} to exit`)
+    console.log(`${pc.green('->')} press ${pc.green('r')} to relaunch`)
+
+    process.stdin.on('data', async (data) => {
+      const input = data.toString().trim().toLocaleLowerCase()
+      if (input === 'r') {
+        if (child) {
+          await child.kill()
+          if (closePromise)
+            await closePromise
+          log('relaunch...')
+          startChild(file, options['--'])
+        }
+        else {
+          log('relaunch...')
+
+          startChild(file, options['--'])
+        }
+      }
+      if (input === 'e')
+        exit()
+    })
+  })
+
+cli
+  .command('generate <file> [workdir]', 'generate code(mainly for ci)')
+  .allowUnknownOptions()
+  .action((file, workdir, options) => {
+    if (workdir)
+      process.env.PS_WORKDIR = workdir
+    process.env.PS_GENERATE = 'true'
+    process.env.PS_CONFIG_FILE = options.config
+    startChild(file, options['--'])
+  })
+
+cli.help()
+cli.version(require('../package.json').version)
+
+cli.parse()