phecda-server 6.1.0 → 7.0.0-alpha.1

package/assets/ps.json

@@ -1,24 +1,24 @@
-{
-  "$schema": "https://unpkg.com/phecda-server/assets/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": []
-
-}
+{
+  "$schema": "https://unpkg.com/phecda-server/assets/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,extension,pipe,filter,addon}.ts"]
+    }
+  },
+  "virtualFile": {},
+  "moduleFile": []
+
+}

package/bin/cli.mjs

@@ -1,158 +1,166 @@
 #! /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 [root]', 'init config file')
-  .allowUnknownOptions()
-  .option('-t,--tsconfig <tsconfig>', 'init tsconfig file', {
-    default: 'tsconfig.json',
-  })
-  .action(async (root, options) => {
-    if (!root)
-      root = ''
-
-    const tsconfigPath = join(root, options.tsconfig)
-    const psconfigPath = join(root, 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)
-    }
-
-    log('init finish')
-  })
-
-cli
-  .command('<file> [root]', 'run file')
-  .alias('run')
-  .allowUnknownOptions()
-  .alias('run')
-  .action((file, root, options) => {
-    if (root)
-      process.env.PS_WORKDIR = root
-    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> [root]', 'generate code(mainly for ci)')
-  .allowUnknownOptions()
-  .action((file, root, options) => {
-    if (root)
-      process.env.PS_WORKDIR = root
-    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()
+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 === 5) {
+        log('Does not comply with strict mode', 'error')
+        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 [root]', 'init config file')
+  .allowUnknownOptions()
+  .option('-t,--tsconfig <tsconfig>', 'init tsconfig file', {
+    default: 'tsconfig.json',
+  })
+  .action(async (root, options) => {
+    if (!root)
+      root = ''
+
+    const tsconfigPath = join(root, options.tsconfig)
+    const psconfigPath = join(root, 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)
+    }
+
+    log('init finish')
+  })
+
+cli
+  .command('<file> [root]', 'run file')
+  .alias('run')
+  .allowUnknownOptions()
+  .alias('run')
+  .action((file, root, options) => {
+    if (root)
+      process.env.PS_WORKDIR = root
+    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()
+
+      if (input === 'c')
+        console.clear()
+    })
+  })
+
+cli
+  .command('generate <file> [root]', 'generate code(mainly for ci)')
+  .allowUnknownOptions()
+  .action((file, root, options) => {
+    if (root)
+      process.env.PS_WORKDIR = root
+    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()

package/dist/{chunk-NL6QBQAR.js → chunk-7YQ57BQS.js}

@@ -3,12 +3,12 @@
 
 
 
-var _chunkTVT62GIXjs = require('./chunk-TVT62GIX.js');
+var _chunkJ5CFUN4Vjs = require('./chunk-J5CFUN4V.js');
 
 // src/meta.ts
 var Meta = class {
   static {
-    _chunkTVT62GIXjs.__name.call(void 0, this, "Meta");
+    _chunkJ5CFUN4Vjs.__name.call(void 0, this, "Meta");
   }
   
   
@@ -23,7 +23,7 @@ require('reflect-metadata');
 var _events = require('events'); var _events2 = _interopRequireDefault(_events);
 var _phecdacore = require('phecda-core');
 var _debug = require('debug'); var _debug2 = _interopRequireDefault(_debug);
-var debug = _debug2.default.call(void 0, "phecda-server(createPhecda)");
+var debug = _debug2.default.call(void 0, "phecda-server(Factory)");
 var emitter = new (0, _events2.default)();
 function defaultServerInject() {
   if (!_phecdacore.getInject.call(void 0, "watcher")) {
@@ -37,11 +37,11 @@ function defaultServerInject() {
     });
   }
 }
-_chunkTVT62GIXjs.__name.call(void 0, defaultServerInject, "defaultServerInject");
+_chunkJ5CFUN4Vjs.__name.call(void 0, defaultServerInject, "defaultServerInject");
 var phecdaNamespace = /* @__PURE__ */ new Map();
 var ServerPhecda = (_class = class {
   static {
-    _chunkTVT62GIXjs.__name.call(void 0, this, "ServerPhecda");
+    _chunkJ5CFUN4Vjs.__name.call(void 0, this, "ServerPhecda");
   }
   __init() {this.moduleMap = /* @__PURE__ */ new Map()}
   __init2() {this.meta = []}
@@ -53,7 +53,7 @@ var ServerPhecda = (_class = class {
   
   constructor(options) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);_class.prototype.__init5.call(this);
     defaultServerInject();
-    const { namespace = "default", parseModule = /* @__PURE__ */ _chunkTVT62GIXjs.__name.call(void 0, (module) => module, "parseModule"), parseMeta = /* @__PURE__ */ _chunkTVT62GIXjs.__name.call(void 0, (meta) => meta, "parseMeta"), generators = [] } = options;
+    const { namespace = "default", parseModule = /* @__PURE__ */ _chunkJ5CFUN4Vjs.__name.call(void 0, (module) => module, "parseModule"), parseMeta = /* @__PURE__ */ _chunkJ5CFUN4Vjs.__name.call(void 0, (meta) => meta, "parseMeta"), generators = [] } = options;
     phecdaNamespace.set(namespace, this);
     this.parseMeta = parseMeta;
     this.parseModule = parseModule;
@@ -61,8 +61,8 @@ var ServerPhecda = (_class = class {
   }
   async start(models) {
     for (const model of models) await this.buildDepModule(model);
-    const generateCode = /* @__PURE__ */ _chunkTVT62GIXjs.__name.call(void 0, async () => {
-      if (_chunkTVT62GIXjs.IS_HMR) {
+    const generateCode = /* @__PURE__ */ _chunkJ5CFUN4Vjs.__name.call(void 0, async () => {
+      if (_chunkJ5CFUN4Vjs.IS_HMR) {
         return Promise.all(this.generators.map((generator) => {
           debug(`generate "${generator.name}" code to ${generator.path}`);
           return generator.output(this.meta);
@@ -70,9 +70,9 @@ var ServerPhecda = (_class = class {
       }
     }, "generateCode");
     generateCode().then(() => {
-      if (_chunkTVT62GIXjs.IS_ONLY_GENERATE) process.exit(4);
+      if (_chunkJ5CFUN4Vjs.IS_ONLY_GENERATE) process.exit(4);
     });
-    if (_chunkTVT62GIXjs.IS_HMR) {
+    if (_chunkJ5CFUN4Vjs.IS_HMR) {
       if (!globalThis.__PS_HMR__) globalThis.__PS_HMR__ = [];
       _optionalChain([globalThis, 'access', _2 => _2.__PS_HMR__, 'optionalAccess', _3 => _3.push, 'call', _4 => _4(async (files) => {
         debug("reload files ");
@@ -128,8 +128,8 @@ var ServerPhecda = (_class = class {
       if (!module) throw new Error(`exist Circular-Dependency or Multiple modules with the same name/tag [tag] ${String(tag)}--[module] ${Model}`);
       if (this.modelMap.get(module) !== Model && !this.modelSet.has(Model)) {
         this.modelSet.add(Model);
-        if (module instanceof Model) _chunkTVT62GIXjs.log.call(void 0, `Module taged ${String(tag)} has been overridden`);
-        else _chunkTVT62GIXjs.log.call(void 0, `Synonym module: Module taged "${String(tag)}" has been loaded before, so phecda-server won't load Module "${Model.name}"`, "warn");
+        if (module instanceof Model) _chunkJ5CFUN4Vjs.log.call(void 0, `Module taged ${String(tag)} has been overridden`);
+        else _chunkJ5CFUN4Vjs.log.call(void 0, `Synonym module: Module taged "${String(tag)}" has been loaded before, so phecda-server won't load Module "${Model.name}"`, "warn");
       }
       return {
         module,
@@ -152,7 +152,7 @@ var ServerPhecda = (_class = class {
     }
     this.meta.push(...getMetaFromInstance(module, tag, Model.name).map(this.parseMeta).filter((item) => !!item));
     debug(`init module "${String(tag)}"`);
-    if (!_chunkTVT62GIXjs.IS_ONLY_GENERATE) await _phecdacore.invokeInit.call(void 0, module);
+    if (!_chunkJ5CFUN4Vjs.IS_ONLY_GENERATE) await _phecdacore.invokeInit.call(void 0, module);
     debug(`add module "${String(tag)}"`);
     this.moduleMap.set(tag, module);
     this.modelMap.set(module, Model);
@@ -175,7 +175,7 @@ async function Factory(models, opts = {}) {
   await phecda.start(models);
   return phecda;
 }
-_chunkTVT62GIXjs.__name.call(void 0, Factory, "Factory");
+_chunkJ5CFUN4Vjs.__name.call(void 0, Factory, "Factory");
 function useS(nsOrModel, namespace) {
   if (!nsOrModel) {
     namespace = "default";
@@ -188,7 +188,7 @@ function useS(nsOrModel, namespace) {
   if (nsOrModel && typeof nsOrModel !== "string") return serverPhecda.get(nsOrModel);
   else return serverPhecda;
 }
-_chunkTVT62GIXjs.__name.call(void 0, useS, "useS");
+_chunkJ5CFUN4Vjs.__name.call(void 0, useS, "useS");
 function getMetaFromInstance(instance, tag, name) {
   const propertyKeys = _phecdacore.getMetaKey.call(void 0, instance).filter((item) => typeof item === "string");
   const baseMeta = _phecdacore.getMergedMeta.call(void 0, instance, void 0);
@@ -202,7 +202,7 @@ function getMetaFromInstance(instance, tag, name) {
       func: i
     };
     if (baseMeta.controller) {
-      if (typeof tag !== "string") _chunkTVT62GIXjs.log.call(void 0, `can't use Tag with ${typeof tag} on controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
+      if (typeof tag !== "string") _chunkJ5CFUN4Vjs.log.call(void 0, `can't use Tag with ${typeof tag} on controller "${instance.constructor.name}",instead with "${tag = String(tag)}"`, "error");
       metaData.controller = baseMeta.controller;
       metaData[baseMeta.controller] = {
         ...baseMeta[baseMeta.controller],
@@ -222,9 +222,8 @@ function getMetaFromInstance(instance, tag, name) {
         ...meta.define
       };
       for (const item of [
-        "plugins",
-        "guards",
-        "interceptors"
+        "addons",
+        "guards"
       ]) {
         const set = new Set(baseMeta[item]);
         if (meta[item]) {
@@ -241,7 +240,7 @@ function getMetaFromInstance(instance, tag, name) {
     return new Meta(deepFreeze(metaData), getParamTypes(instance, i) || []);
   });
 }
-_chunkTVT62GIXjs.__name.call(void 0, getMetaFromInstance, "getMetaFromInstance");
+_chunkJ5CFUN4Vjs.__name.call(void 0, getMetaFromInstance, "getMetaFromInstance");
 function deepFreeze(object) {
   Object.freeze(object);
   Object.getOwnPropertyNames(object).forEach((prop) => {
@@ -249,11 +248,11 @@ function deepFreeze(object) {
   });
   return object;
 }
-_chunkTVT62GIXjs.__name.call(void 0, deepFreeze, "deepFreeze");
+_chunkJ5CFUN4Vjs.__name.call(void 0, deepFreeze, "deepFreeze");
 function getParamTypes(Model, key) {
   return Reflect.getMetadata("design:paramtypes", Model, key);
 }
-_chunkTVT62GIXjs.__name.call(void 0, getParamTypes, "getParamTypes");
+_chunkJ5CFUN4Vjs.__name.call(void 0, getParamTypes, "getParamTypes");