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

package/assets/ps.json

@@ -15,7 +15,7 @@
   "unimport": {
     "dirs": ["."],
     "dirsScanOptions": {
-      "filePatterns": ["*.{service,controller,module,rpc,edge,guard,extension,pipe,filter,addon}.ts"]
+      "filePatterns": ["*.{service,controller,module,rpc,solo,guard,extension,pipe,filter,addon}.ts"]
     }
   },
   "virtualFile": {},

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"
+    }
+  },
+
+  "required": ["resolve"]
+}

package/bin/cli.mjs

@@ -3,11 +3,18 @@ import { fork } from 'child_process'
 import { createRequire } from 'module'
 import { fileURLToPath } from 'url'
 
-import { dirname, join, resolve } from 'path'
+import { dirname, resolve } from 'path'
 import pc from 'picocolors'
 import cac from 'cac'
 import fse from 'fs-extra'
-import { log } from '../dist/index.mjs'
+import { log as psLog } from '../dist/index.mjs'
+
+const log = (...args) => {
+  if (process.env.PS_BAN_CLI_LOG)
+    return
+
+  psLog(...args)
+}
 
 const cli = cac('phecda').option('-c,--config <config>', 'config file', {
   default: 'ps.json',
@@ -30,7 +37,7 @@ if (nodeVersion < 18.19) {
 
 function startChild(file, args) {
   child = fork(file, {
-    env: { NODE_ENV: 'development', ...process.env },
+    env: { ...process.env },
     stdio: 'inherit',
     execArgv: [
       nodeVersion < 18.19
@@ -42,20 +49,12 @@ function startChild(file, 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...')
+      if (code === 4171)
         startChild(file, args)
-      }
+
+      if (code === 4172)
+        return process.exit()
+
       child = undefined
 
       resolve()
@@ -85,11 +84,11 @@ cli
     default: 'tsconfig.json',
   })
   .action(async (root, options) => {
-    if (!root)
-      root = ''
+    if (root)
+      process.chdir(root)
 
-    const tsconfigPath = join(root, options.tsconfig)
-    const psconfigPath = join(root, options.config)
+    const tsconfigPath = options.tsconfig
+    const psconfigPath = process.env.PS_CONFIG_FILE || options.config
 
     if (!fse.existsSync(tsconfigPath)) {
       log(`create ${tsconfigPath}`)
@@ -113,17 +112,26 @@ cli
   .command('<file> [root]', 'run file')
   .alias('run')
   .allowUnknownOptions()
-  .alias('run')
+  .option('-p,--prod [prod]', 'prod mode', {
+    default: false,
+  })
   .action((file, root, options) => {
     if (root)
-      process.env.PS_WORKDIR = root
-    process.env.PS_CONFIG_FILE = options.config
+      process.chdir(root)
+
+    if (options.prod)
+      process.env.NODE_ENV = 'production'
+    else
+      process.env.NODE_ENV = 'development'
+
+    process.env.PS_CONFIG_FILE = 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`)
+    console.log(`${pc.green('->')} press ${pc.green('c')} to clear terminal`)
 
     process.stdin.on('data', async (data) => {
       const input = data.toString().trim().toLocaleLowerCase()
@@ -154,9 +162,9 @@ cli
   .allowUnknownOptions()
   .action((file, root, options) => {
     if (root)
-      process.env.PS_WORKDIR = 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/chunk-4LLLQOMF.js

@@ -0,0 +1,152 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var _class;var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// src/common.ts
+var ERROR_SYMBOL = "__PS_ERROR__";
+var IS_DEV = process.env.NODE_ENV === "development";
+var IS_ONLY_GENERATE = !!process.env.PS_GENERATE;
+var IS_STRICT = !!process.env.PS_STRICT;
+var IS_PURE = !!process.env.PS_PURE;
+var LOG_LEVEL = Number(process.env.PS_LOG_LEVEL || 0);
+var PS_EXIT_CODE = /* @__PURE__ */ function(PS_EXIT_CODE2) {
+  PS_EXIT_CODE2[PS_EXIT_CODE2["RELAUNCH"] = 4171] = "RELAUNCH";
+  PS_EXIT_CODE2[PS_EXIT_CODE2["EXIT"] = 4172] = "EXIT";
+  return PS_EXIT_CODE2;
+}({});
+
+// src/utils.ts
+var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
+var _tsmixer = require('ts-mixer');
+var isObject = /* @__PURE__ */ __name((fn) => fn !== null && typeof fn === "object", "isObject");
+var isPlainObject = /* @__PURE__ */ __name((fn) => {
+  if (!isObject(fn)) return false;
+  const proto = Object.getPrototypeOf(fn);
+  if (proto === null) return true;
+  const ctor = Object.prototype.hasOwnProperty.call(proto, "constructor") && proto.constructor;
+  return typeof ctor === "function" && ctor instanceof ctor && Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object);
+}, "isPlainObject");
+var InternalLogger = (_class = class InternalLogger2 {constructor() { _class.prototype.__init.call(this);_class.prototype.__init2.call(this); }
+  static {
+    __name(this, "InternalLogger");
+  }
+  
+  __init() {this.color = {
+    debug: "bgMagenta",
+    error: "red",
+    info: "gray",
+    warn: "yellow",
+    log: "green"
+  }}
+  __init2() {this.dateFormatter = new Intl.DateTimeFormat(void 0, {
+    year: "numeric",
+    hour: "numeric",
+    minute: "numeric",
+    second: "numeric",
+    day: "2-digit",
+    month: "2-digit"
+  })}
+  diffTimestamp() {
+    const now = Date.now();
+    if (!this.time) return "";
+    const diff = now - this.time;
+    this.time = now;
+    return diff ? _picocolors2.default.yellow(` +${diff}`) : "";
+  }
+  colorize(message, logLevel) {
+    return _picocolors2.default[this.color[logLevel]](message);
+  }
+  isAllowLog(level) {
+    const logLevel = {
+      debug: -1,
+      info: 0,
+      log: 1,
+      warn: 2,
+      error: 3
+    }[level];
+    if (logLevel < LOG_LEVEL) return false;
+    return true;
+  }
+  stringifyMessage(message, logLevel) {
+    if (typeof message === "function") {
+      const messageAsStr = Function.prototype.toString.call(message);
+      const isClass = messageAsStr.startsWith("class ");
+      if (isClass) {
+        return this.stringifyMessage(message.name, logLevel);
+      }
+      return this.stringifyMessage(message(), logLevel);
+    }
+    return isPlainObject(message) || Array.isArray(message) ? `${this.colorize("Object:", logLevel)}
+${JSON.stringify(message, (key, value) => typeof value === "bigint" ? value.toString() : value, 2)}
+` : this.colorize(message, logLevel);
+  }
+  log(msg, level, ctx) {
+    if (!this.isAllowLog(level)) return;
+    msg = this.stringifyMessage(msg, level);
+    const pidMsg = this.colorize(`[${process.env.PS_APP_NAME || "phecda-server"}] ${process.pid}`, level);
+    const ctxMsg = ctx ? this.colorize(_picocolors2.default.bold(`[${ctx}] `), level) : "";
+    const timeDiff = this.diffTimestamp();
+    const levelMsg = this.colorize(level.toUpperCase().padStart(7, " "), level);
+    process.stdout.write(`${pidMsg} ${this.dateFormatter.format(Date.now())} ${levelMsg} ${ctxMsg}${msg}${timeDiff}
+`);
+  }
+}, _class);
+var _logger = new InternalLogger();
+function setLogger(logger) {
+  _logger = logger;
+}
+__name(setLogger, "setLogger");
+function getLogger() {
+  return _logger;
+}
+__name(getLogger, "getLogger");
+function log(msg, level = "log", ctx) {
+  _logger.log(msg, level, ctx);
+}
+__name(log, "log");
+function runMiddleware(ctx, middleware) {
+  return new Promise((resolve) => {
+    middleware(ctx.getRequest(), ctx.getResponse(), resolve);
+  });
+}
+__name(runMiddleware, "runMiddleware");
+
+// src/hmr.ts
+function HMR(cb) {
+  if (IS_DEV) {
+    if (!globalThis.__PS_HMR__) globalThis.__PS_HMR__ = [];
+    globalThis.__PS_HMR__.push(cb);
+  }
+}
+__name(HMR, "HMR");
+async function RELOAD(oldModels, newModels) {
+  log("reload module...");
+  for (const cb of globalThis.__PS_HMR__) await cb(oldModels, newModels);
+  log("reload done");
+}
+__name(RELOAD, "RELOAD");
+function RELAUNCH() {
+  if (IS_DEV) {
+    log("relaunch...");
+    process.exit(PS_EXIT_CODE.RELAUNCH);
+  }
+}
+__name(RELAUNCH, "RELAUNCH");
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+exports.__name = __name; exports.ERROR_SYMBOL = ERROR_SYMBOL; exports.IS_DEV = IS_DEV; exports.IS_ONLY_GENERATE = IS_ONLY_GENERATE; exports.IS_STRICT = IS_STRICT; exports.IS_PURE = IS_PURE; 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; exports.HMR = HMR; exports.RELOAD = RELOAD; exports.RELAUNCH = RELAUNCH;