egg 3.29.0 → 3.30.1

package/README.md

@@ -10,7 +10,7 @@ English | [简体中文](./README.zh-CN.md)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Feggjs%2Fegg.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Feggjs%2Fegg?ref=badge_shield)
 
 [![Continuous Integration](https://github.com/eggjs/egg/actions/workflows/nodejs-3.x.yml/badge.svg)](https://github.com/eggjs/egg/actions?query=branch%3A3.x)
-[![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg)
+[![codecov](https://codecov.io/gh/eggjs/egg/branch/3.x/graph/badge.svg?token=2sKMCDNkcl)](https://app.codecov.io/gh/eggjs/egg/tree/3.x)
 [![Known Vulnerabilities](https://snyk.io/test/npm/egg/badge.svg?style=flat-square)](https://snyk.io/test/npm/egg)
 [![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/eggjs?style=flat-square)](https://opencollective.com/eggjs)
 

package/README.zh-CN.md

@@ -9,7 +9,7 @@
 [![NPM download](https://img.shields.io/npm/dm/egg.svg?style=flat-square)](https://npmjs.org/package/egg)
 
 [![Continuous Integration](https://github.com/eggjs/egg/actions/workflows/nodejs.yml/badge.svg)](https://github.com/eggjs/egg/actions?query=branch%3Amaster)
-[![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg)
+[![codecov](https://codecov.io/gh/eggjs/egg/branch/3.x/graph/badge.svg?token=2sKMCDNkcl)](https://app.codecov.io/gh/eggjs/egg/tree/3.x)
 [![Known Vulnerabilities](https://snyk.io/test/npm/egg/badge.svg?style=flat-square)](https://snyk.io/test/npm/egg)
 [![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/eggjs?style=flat-square)](https://opencollective.com/eggjs)
 

package/index.d.ts

@@ -19,9 +19,9 @@ import {
   HttpClientResponse as HttpClientResponseOld,
 } from 'urllib';
 import {
-  RequestURL as HttpClientRequestURL,
-  RequestOptions as HttpClientRequestOptions,
-  HttpClientResponse,
+  RequestURL,
+  RequestOptions,
+  HttpClientResponse as HttpClientResponseNext,
 } from 'urllib-next';
 import {
   EggCoreBase,
@@ -60,7 +60,9 @@ declare module 'egg' {
   //   return await app.httpclient.request(url, options);
   // }
   // ```
-  export { HttpClientRequestURL, HttpClientRequestOptions, HttpClientResponse };
+  export type HttpClientRequestURL = RequestURL;
+  export type HttpClientRequestOptions = RequestOptions;
+  export type HttpClientResponse<T = any> = HttpClientResponseNext<T>;
   // Compatible with both urllib@2 and urllib@3 RequestOptions to request
   export interface EggHttpClient extends EventEmitter {
     request<T = any>(url: HttpClientRequestURL): Promise<HttpClientResponseOld<T> | HttpClientResponse<T>>;

package/lib/core/utils.js

@@ -9,18 +9,28 @@ module.exports = {
   safeParseURL,
 };
 
-function convertObject(obj, ignore) {
-  if (!is.array(ignore)) ignore = [ ignore ];
+function convertObject(obj, ignore, ignoreKeyPaths) {
+  if (!is.array(ignore)) {
+    ignore = [ ignore ];
+  }
+  if (!is.array(ignoreKeyPaths)) {
+    ignoreKeyPaths = ignoreKeyPaths ? [ ignoreKeyPaths ] : [];
+  }
+  _convertObject(obj, ignore, ignoreKeyPaths, '');
+}
+
+function _convertObject(obj, ignore, ignoreKeyPaths, keyPath) {
   for (const key of Object.keys(obj)) {
-    obj[key] = convertValue(key, obj[key], ignore);
+    obj[key] = convertValue(key, obj[key], ignore, ignoreKeyPaths, keyPath ? `${keyPath}.${key}` : key);
   }
   return obj;
 }
 
-function convertValue(key, value, ignore) {
+function convertValue(key, value, ignore, ignoreKeyPaths, keyPath) {
   if (is.nullOrUndefined(value)) return value;
 
   let hit = false;
+  let hitKeyPath = false;
   for (const matchKey of ignore) {
     if (is.string(matchKey) && matchKey === key) {
       hit = true;
@@ -30,7 +40,13 @@ function convertValue(key, value, ignore) {
       break;
     }
   }
-  if (!hit) {
+  for (const matchKeyPath of ignoreKeyPaths) {
+    if (is.string(matchKeyPath) && keyPath === matchKeyPath) {
+      hitKeyPath = true;
+      break;
+    }
+  }
+  if (!hit && !hitKeyPath) {
     if (is.symbol(value) || is.regExp(value)) return value.toString();
     if (is.primitive(value) || is.array(value)) return value;
   }
@@ -38,7 +54,10 @@ function convertValue(key, value, ignore) {
   // only convert recursively when it's a plain object,
   // o = {}
   if (Object.getPrototypeOf(value) === Object.prototype) {
-    return convertObject(value, ignore);
+    if (hitKeyPath) {
+      return '<Object>';
+    }
+    return _convertObject(value, ignore, ignoreKeyPaths, keyPath);
   }
 
   // support class

package/lib/egg.js

@@ -395,8 +395,15 @@ class EggApplication extends EggCore {
       ignoreList = [];
     }
 
+    let ignoreKeyPaths;
+    try {
+      ignoreKeyPaths = this.config.dump.ignoreKeyPaths;
+    } catch (e) {
+      ignoreKeyPaths = {};
+    }
+
     const json = extend(true, {}, { config: this.config, plugins: this.loader.allPlugins, appInfo: this.loader.appInfo });
-    utils.convertObject(json, ignoreList);
+    utils.convertObject(json, ignoreList, ignoreKeyPaths ? Object.keys(ignoreKeyPaths) : []);
     return {
       config: json,
       meta: this.loader.configMeta,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "egg",
-  "version": "3.29.0",
+  "version": "3.30.1",
   "publishConfig": {
-    "tag": "release-3.x",
+    "tag": "latest",
     "access": "public"
   },
   "description": "A web framework's framework for Node.js",