@withbuddi/buddi 0.1.0-pre.37 → 0.1.0-pre.39

package/node_modules/hono/dist/types/middleware/mount/index.d.ts

@@ -0,0 +1,46 @@
+import { MiddlewareHandler } from "../../types.js";
+import { Context } from "../../context.js";
+//#region src/middleware/mount/index.d.ts
+type ApplicationHandler = (request: Request, ...args: any) => Response | Promise<Response>;
+type MountOptionHandler = (c: Context) => unknown;
+type MountReplaceRequest = (originalRequest: Request) => Request;
+type MountOptions = MountOptionHandler | {
+  optionHandler?: MountOptionHandler;
+  replaceRequest?: MountReplaceRequest | false;
+};
+/**
+ * `mount()` allows you to mount applications built with other frameworks into your Hono application.
+ *
+ * @see {@link https://hono.dev/docs/api/hono#mount}
+ *
+ * @param {Function} applicationHandler - other Request Handler
+ * @param {MountOptions} [options] - options of `mount()`
+ * @returns {MiddlewareHandler} handler to register with `app.all()`
+ *
+ * @example
+ * ```ts
+ * import { Router as IttyRouter } from 'itty-router'
+ * import { Hono } from 'hono'
+ * import { mount } from 'hono/mount'
+ * // Create itty-router application
+ * const ittyRouter = IttyRouter()
+ * // GET /itty-router/hello
+ * ittyRouter.get('/hello', () => new Response('Hello from itty-router'))
+ *
+ * const app = new Hono()
+ * app.all('/itty-router/*', mount(ittyRouter.handle))
+ * ```
+ *
+ * @example
+ * ```ts
+ * const app = new Hono()
+ * // Send the request to another application without modification.
+ * app.all('/app/*', mount(anotherApp, {
+ *   replaceRequest: (req) => req,
+ * }))
+ * ```
+ */
+export declare const mount: (applicationHandler: ApplicationHandler, options?: MountOptions) => MiddlewareHandler;
+//#endregion
+export type { ApplicationHandler, MountOptionHandler, MountOptions, MountReplaceRequest };
+export {};

package/node_modules/hono/dist/types/request.d.ts

@@ -217,7 +217,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    */
   valid<T extends keyof I & keyof ValidationTargets>(target: T): InputToDataByTarget<I, T>;
   /**
-   * `.url()` can get the request url strings.
+   * `.url` can get the request url strings.
    *
    * @see {@link https://hono.dev/docs/api/request#url}
    *
@@ -231,7 +231,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    */
   get url(): string;
   /**
-   * `.method()` can get the method name of the request.
+   * `.method` can get the method name of the request.
    *
    * @see {@link https://hono.dev/docs/api/request#method}
    *
@@ -245,7 +245,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
   get method(): string;
   get [GET_MATCH_RESULT](): Result<[unknown, RouterRoute]>;
   /**
-   * `.matchedRoutes()` can return a matched route in the handler
+   * `.matchedRoutes` can return a matched route in the handler
    *
    * @deprecated
    *
@@ -273,7 +273,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    */
   get matchedRoutes(): RouterRoute[];
   /**
-   * `routePath()` can retrieve the path registered within the handler
+   * `.routePath` can retrieve the path registered within the handler
    *
    * @deprecated
    *

package/node_modules/hono/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.13.12",
+  "version": "4.13.13",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -103,6 +103,11 @@
       "import": "./dist/helper/route/index.js",
       "require": "./dist/cjs/helper/route/index.js"
     },
+    "./mount": {
+      "types": "./dist/types/middleware/mount/index.d.ts",
+      "import": "./dist/middleware/mount/index.js",
+      "require": "./dist/cjs/middleware/mount/index.js"
+    },
     "./cookie": {
       "types": "./dist/types/helper/cookie/index.d.ts",
       "import": "./dist/helper/cookie/index.js",
@@ -457,6 +462,9 @@
       "route": [
         "./dist/types/helper/route"
       ],
+      "mount": [
+        "./dist/types/middleware/mount"
+      ],
       "cookie": [
         "./dist/types/helper/cookie"
       ],

package/node_modules/imapflow/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.2.4](https://github.com/postalsys/imapflow/compare/v2.2.3...v2.2.4) (2026-10-03)
+
+
+### Bug Fixes
+
+* **deps:** hold pino at 10.3.x to match EmailEngine ([65062e0](https://github.com/postalsys/imapflow/commit/65062e0a3fb66527e7296ee288e658ef215851d4))
+
+## [2.2.3](https://github.com/postalsys/imapflow/compare/v2.2.2...v2.2.3) (2026-10-03)
+
+
+### Bug Fixes
+
+* reject NUL in a non-ASCII search value instead of sending it as a literal ([8c35084](https://github.com/postalsys/imapflow/commit/8c35084f12376a1195989bf99621c2587f548aca))
+* send non-ASCII search values as literals ([b58d93e](https://github.com/postalsys/imapflow/commit/b58d93e49dd37ef008418c2670afaf53b3d78034)), closes [#417](https://github.com/postalsys/imapflow/issues/417)
+
 ## [2.2.2](https://github.com/postalsys/imapflow/compare/v2.2.1...v2.2.2) (2026-10-03)
 
 

package/node_modules/imapflow/dist/cjs/package-info.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "imapflow";
-export declare const version = "2.2.2";
+export declare const version = "2.2.4";
 export declare const homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/cjs/package-info.js

@@ -3,5 +3,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.homepage = exports.version = exports.name = void 0;
 exports.name = "imapflow";
-exports.version = "2.2.2";
+exports.version = "2.2.4";
 exports.homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/cjs/search-compiler.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchCompiler = void 0;
 const tools_js_1 = require("./tools.js");
+// Matches any character outside the ASCII range
+const UNICODE_PATTERN = /[^\x00-\x7F]/;
 /**
  * Sets a boolean flag in the IMAP search attributes.
  * Automatically handles UN- prefixing for falsy values.
@@ -38,6 +40,17 @@ let setBoolOpt = (attributes, term, value) => {
  * @returns The joined sequence set string
  */
 let toSequenceValue = (value) => [].concat(value).join(',');
+/**
+ * Builds the token for a search value. A quoted string may only carry 7-bit
+ * characters (RFC 3501 section 9), so a non-ASCII value is sent as a literal;
+ * strict servers reply BAD to UTF-8 inside a quoted string. A literal can not
+ * carry NUL either (CHAR8 is %x01-ff), so such a value stays an ATOM and the
+ * compiler rejects it.
+ *
+ * @param value - The search value
+ * @returns An ATOM token (quoted by the compiler when needed), or a LITERAL token
+ */
+let toSearchValue = (value) => UNICODE_PATTERN.test(value) && !value.includes('\0') ? { type: 'LITERAL', value: Buffer.from(value) } : { type: 'ATOM', value };
 /**
  * Adds a search option with its value(s) to the attributes array.
  * Handles NOT operations and array values.
@@ -54,10 +67,10 @@ let setOpt = (attributes, term, value) => {
     attributes.push({ type: 'ATOM', value: term.toUpperCase() });
     // Handle array values (e.g. HEADER name/value pairs)
     if (Array.isArray(value)) {
-        value.forEach(entry => attributes.push({ type: 'ATOM', value: (entry || '').toString() }));
+        value.forEach(entry => attributes.push(toSearchValue((entry || '').toString())));
     }
     else {
-        attributes.push({ type: 'ATOM', value: value.toString() });
+        attributes.push(toSearchValue(value.toString()));
     }
 };
 /**
@@ -89,8 +102,6 @@ let processDateField = (attributes, term, value) => {
     }
     setOpt(attributes, term, formatted);
 };
-// Pre-compiled regex for better performance
-const UNICODE_PATTERN = /[^\x00-\x7F]/;
 /**
  * Throws a coded search compilation error.
  *
@@ -103,20 +114,13 @@ let fail = (code, message) => {
     throw error;
 };
 /**
- * Checks if a string contains Unicode characters.
- * Used to determine if CHARSET UTF-8 needs to be specified.
+ * Checks whether any search value was compiled into a literal, which only
+ * happens for non-ASCII values and means CHARSET UTF-8 needs to be specified.
  *
- * @param str - String to check
- * @returns True if string contains non-ASCII characters
+ * @param attributes - Compiled search attributes
+ * @returns True if a LITERAL token is present
  */
-let isUnicodeString = (str) => {
-    if (!str || typeof str !== 'string') {
-        return false;
-    }
-    // Regex test is ~3-5x faster than Buffer.byteLength
-    // Matches any character outside ASCII range (0x00-0x7F)
-    return UNICODE_PATTERN.test(str);
-};
+let hasLiteral = (attributes) => attributes.some(attr => (Array.isArray(attr) ? hasLiteral(attr) : attr.type === 'LITERAL'));
 /**
  * Compiles a JavaScript object query into IMAP search command attributes.
  * Supports standard IMAP search criteria and extensions like OBJECTID and Gmail extensions.
@@ -145,8 +149,6 @@ let isUnicodeString = (str) => {
  */
 const searchCompiler = (connection, query) => {
     const attributes = [];
-    // Track if we need to specify UTF-8 charset
-    let hasUnicode = false;
     /**
      * Recursively walks through the query object and builds IMAP attributes.
      * @param params - Query parameters to process
@@ -236,9 +238,6 @@ const searchCompiler = (connection, query) => {
                 case 'SUBJECT':
                 case 'TEXT':
                 case 'TO':
-                    if (isUnicodeString(params[term])) {
-                        hasUnicode = true;
-                    }
                     if (params[term]) {
                         setOpt(attributes, term, params[term]);
                     }
@@ -286,9 +285,6 @@ const searchCompiler = (connection, query) => {
                 case 'GMRAW':
                 case 'GMAILRAW': // alias for GMRAW
                     if (connection.capabilities.has('X-GM-EXT-1')) {
-                        if (isUnicodeString(params[term])) {
-                            hasUnicode = true;
-                        }
                         setOpt(attributes, 'X-GM-RAW', params[term]);
                     }
                     else {
@@ -329,9 +325,6 @@ const searchCompiler = (connection, query) => {
                         fail('MissingServerExtension', 'Server does not support X-GM-EXT-1 extension required for label search');
                     }
                     let rawQuery = rawParts.join(' ');
-                    if (isUnicodeString(rawQuery)) {
-                        hasUnicode = true;
-                    }
                     setOpt(attributes, 'X-GM-RAW', rawQuery);
                     break;
                 }
@@ -391,9 +384,6 @@ const searchCompiler = (connection, query) => {
                             if (typeof value !== 'string') {
                                 return;
                             }
-                            if (isUnicodeString(value)) {
-                                hasUnicode = true;
-                            }
                             setOpt(attributes, term, [header.toUpperCase().trim(), value]);
                         });
                     }
@@ -473,7 +463,7 @@ const searchCompiler = (connection, query) => {
     walk(query);
     // If we encountered Unicode strings and UTF-8 is not already accepted,
     // prepend CHARSET UTF-8 to the search command
-    if (hasUnicode && !connection.enabled.has('UTF8=ACCEPT')) {
+    if (!connection.enabled.has('UTF8=ACCEPT') && hasLiteral(attributes)) {
         attributes.unshift({ type: 'ATOM', value: 'UTF-8' });
         attributes.unshift({ type: 'ATOM', value: 'CHARSET' });
     }

package/node_modules/imapflow/dist/esm/package-info.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "imapflow";
-export declare const version = "2.2.2";
+export declare const version = "2.2.4";
 export declare const homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/esm/package-info.js

@@ -1,4 +1,4 @@
 // Generated by scripts/build.js from package.json. Do not edit by hand.
 export const name = "imapflow";
-export const version = "2.2.2";
+export const version = "2.2.4";
 export const homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/esm/search-compiler.js

@@ -1,5 +1,7 @@
 /* eslint no-control-regex:0 */
 import { formatDate, formatFlag, toValidDate, isRev2Active } from './tools.js';
+// Matches any character outside the ASCII range
+const UNICODE_PATTERN = /[^\x00-\x7F]/;
 /**
  * Sets a boolean flag in the IMAP search attributes.
  * Automatically handles UN- prefixing for falsy values.
@@ -35,6 +37,17 @@ let setBoolOpt = (attributes, term, value) => {
  * @returns The joined sequence set string
  */
 let toSequenceValue = (value) => [].concat(value).join(',');
+/**
+ * Builds the token for a search value. A quoted string may only carry 7-bit
+ * characters (RFC 3501 section 9), so a non-ASCII value is sent as a literal;
+ * strict servers reply BAD to UTF-8 inside a quoted string. A literal can not
+ * carry NUL either (CHAR8 is %x01-ff), so such a value stays an ATOM and the
+ * compiler rejects it.
+ *
+ * @param value - The search value
+ * @returns An ATOM token (quoted by the compiler when needed), or a LITERAL token
+ */
+let toSearchValue = (value) => UNICODE_PATTERN.test(value) && !value.includes('\0') ? { type: 'LITERAL', value: Buffer.from(value) } : { type: 'ATOM', value };
 /**
  * Adds a search option with its value(s) to the attributes array.
  * Handles NOT operations and array values.
@@ -51,10 +64,10 @@ let setOpt = (attributes, term, value) => {
     attributes.push({ type: 'ATOM', value: term.toUpperCase() });
     // Handle array values (e.g. HEADER name/value pairs)
     if (Array.isArray(value)) {
-        value.forEach(entry => attributes.push({ type: 'ATOM', value: (entry || '').toString() }));
+        value.forEach(entry => attributes.push(toSearchValue((entry || '').toString())));
     }
     else {
-        attributes.push({ type: 'ATOM', value: value.toString() });
+        attributes.push(toSearchValue(value.toString()));
     }
 };
 /**
@@ -86,8 +99,6 @@ let processDateField = (attributes, term, value) => {
     }
     setOpt(attributes, term, formatted);
 };
-// Pre-compiled regex for better performance
-const UNICODE_PATTERN = /[^\x00-\x7F]/;
 /**
  * Throws a coded search compilation error.
  *
@@ -100,20 +111,13 @@ let fail = (code, message) => {
     throw error;
 };
 /**
- * Checks if a string contains Unicode characters.
- * Used to determine if CHARSET UTF-8 needs to be specified.
+ * Checks whether any search value was compiled into a literal, which only
+ * happens for non-ASCII values and means CHARSET UTF-8 needs to be specified.
  *
- * @param str - String to check
- * @returns True if string contains non-ASCII characters
+ * @param attributes - Compiled search attributes
+ * @returns True if a LITERAL token is present
  */
-let isUnicodeString = (str) => {
-    if (!str || typeof str !== 'string') {
-        return false;
-    }
-    // Regex test is ~3-5x faster than Buffer.byteLength
-    // Matches any character outside ASCII range (0x00-0x7F)
-    return UNICODE_PATTERN.test(str);
-};
+let hasLiteral = (attributes) => attributes.some(attr => (Array.isArray(attr) ? hasLiteral(attr) : attr.type === 'LITERAL'));
 /**
  * Compiles a JavaScript object query into IMAP search command attributes.
  * Supports standard IMAP search criteria and extensions like OBJECTID and Gmail extensions.
@@ -142,8 +146,6 @@ let isUnicodeString = (str) => {
  */
 export const searchCompiler = (connection, query) => {
     const attributes = [];
-    // Track if we need to specify UTF-8 charset
-    let hasUnicode = false;
     /**
      * Recursively walks through the query object and builds IMAP attributes.
      * @param params - Query parameters to process
@@ -233,9 +235,6 @@ export const searchCompiler = (connection, query) => {
                 case 'SUBJECT':
                 case 'TEXT':
                 case 'TO':
-                    if (isUnicodeString(params[term])) {
-                        hasUnicode = true;
-                    }
                     if (params[term]) {
                         setOpt(attributes, term, params[term]);
                     }
@@ -283,9 +282,6 @@ export const searchCompiler = (connection, query) => {
                 case 'GMRAW':
                 case 'GMAILRAW': // alias for GMRAW
                     if (connection.capabilities.has('X-GM-EXT-1')) {
-                        if (isUnicodeString(params[term])) {
-                            hasUnicode = true;
-                        }
                         setOpt(attributes, 'X-GM-RAW', params[term]);
                     }
                     else {
@@ -326,9 +322,6 @@ export const searchCompiler = (connection, query) => {
                         fail('MissingServerExtension', 'Server does not support X-GM-EXT-1 extension required for label search');
                     }
                     let rawQuery = rawParts.join(' ');
-                    if (isUnicodeString(rawQuery)) {
-                        hasUnicode = true;
-                    }
                     setOpt(attributes, 'X-GM-RAW', rawQuery);
                     break;
                 }
@@ -388,9 +381,6 @@ export const searchCompiler = (connection, query) => {
                             if (typeof value !== 'string') {
                                 return;
                             }
-                            if (isUnicodeString(value)) {
-                                hasUnicode = true;
-                            }
                             setOpt(attributes, term, [header.toUpperCase().trim(), value]);
                         });
                     }
@@ -470,7 +460,7 @@ export const searchCompiler = (connection, query) => {
     walk(query);
     // If we encountered Unicode strings and UTF-8 is not already accepted,
     // prepend CHARSET UTF-8 to the search command
-    if (hasUnicode && !connection.enabled.has('UTF8=ACCEPT')) {
+    if (!connection.enabled.has('UTF8=ACCEPT') && hasLiteral(attributes)) {
         attributes.unshift({ type: 'ATOM', value: 'UTF-8' });
         attributes.unshift({ type: 'ATOM', value: 'CHARSET' });
     }

package/node_modules/imapflow/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "2.2.2",
+    "version": "2.2.4",
     "description": "IMAP Client for Node",
     "type": "module",
     "main": "./dist/cjs/imap-flow.js",
@@ -87,7 +87,7 @@
         "libbase64": "1.3.1",
         "libmime": "5.4.6",
         "libqp": "2.1.2",
-        "pino": "10.4.0",
+        "pino": "10.3.1",
         "socks": "2.8.10"
     },
     "engines": {

package/node_modules/pino/CONTRIBUTING.md

@@ -18,10 +18,6 @@ There are a few basic ground-rules for contributors:
 1. All pull-requests for new features **must** target the `main` branch. PRs to fix bugs in LTS releases are also allowed.
 1. Contributors should attempt to adhere to the prevailing code-style.
 1. 100% code coverage
-1. Pure-AI contributions with no human in the loop are not welcome. Pull
-requests ***MUST*** be opened by a human. Pull requests opened by bots not
-managed by the Pino organization will result in the bot being banned
-from the organization.
 
 ## Releases
 
@@ -31,4 +27,4 @@ Declaring formal releases remains the prerogative of the project maintainer.
 
 This is an experiment and feedback is welcome! This document may also be subject to pull-requests or changes by contributors where you believe you have something valuable to add or change.
 
------------------------------------------
+-----------------------------------------

package/node_modules/pino/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-present Matteo Collina, David Mark Clements and the Pino contributors listed at <https://github.com/pinojs/pino#the-team> and in the README file.
+Copyright (c) 2016-2025 Matteo Collina, David Mark Clements and the Pino contributors listed at <https://github.com/pinojs/pino#the-team> and in the README file.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/node_modules/pino/README.md

@@ -31,7 +31,7 @@ Pino is built to run on [Node.js](http://nodejs.org).
 
 ### Bare
 
-Pino works on [Bare](https://github.com/holepunchto/bare) with the [`pino-bare`](https://github.com/pinojs/pino-bare) compatibility module.
+Pino works on [Bare](https://github.com/holepunchto/bare) with the [`pino-bare`](https://github.com/pinojs/pino-bare) compatability module.
 
 ### Pear
 

package/node_modules/pino/SECURITY.md

@@ -16,24 +16,8 @@ Pino trusts the applications using it and the environment that it is running in.
 This includes all the application code, the transport, the filesystem and all
 non-externally provided input.
 
-Pino assumes all objects being logged, `logger.info(obj, message)`, are JSON-serializable.
-Applications are responsible for the data structures their code constructs and logs,
-including ensuring that their size, depth, breadth, and reference topology can be
-serialized within acceptable CPU, memory, and output-size bounds. Resource exhaustion
-caused by logging an application-constructed data structure is an application-level
-concern. The `depthLimit` and `edgeLimit` options apply only to Pino's fallback
-serializer after `JSON.stringify` throws; they are not general resource limits.
-Use the `serializers` and `redact` features to sanitize logged objects.
-
-Pino also assumes that applications control the top-level keys of logged objects
-and child logger bindings. Do not pass externally supplied objects directly as
-`logger.info(untrustedObject)` or `logger.child(untrustedObject)`. Top-level
-keys are written at the root of the log line and can conflict with Pino fields
-such as `level`, `time`, or `msg`, as well as application or security fields.
-If untrusted data must be logged, place it under an application-controlled key,
-for example `logger.info({ untrusted })` or `logger.child({ untrusted })`, and
-apply appropriate serialization and redaction. As a matter of good security
-hygiene, prefer not to log untrusted data at all unless it is necessary.
+Pino assumes all objects being logged, `logger.info(obj, message)`, are json-serializable.
+Use the `serializers` and `redact` features to sanitize them.
 
 Pino is not hardened against external prototype pollution attacks, but we
 will accept a vulnerability if Pino can be misused to cause a prototype pollution.

package/node_modules/pino/browser.js

@@ -1,34 +1,9 @@
 'use strict'
 
 const format = require('quick-format-unescaped')
-const Redact = require('@pinojs/redact')
 
 module.exports = pino
 
-const CENSOR = '[Redacted]'
-
-function handleRedactOpts (opts) {
-  if (Array.isArray(opts)) {
-    return { paths: opts, censor: CENSOR }
-  }
-  const { paths, censor = CENSOR, remove } = opts
-  if (!Array.isArray(paths)) {
-    throw Error('pino – redact must contain an array of strings')
-  }
-  return { paths, censor: remove ? undefined : censor, remove }
-}
-
-function buildRedactFn (redact) {
-  if (!redact) return null
-  const { paths, censor, remove } = handleRedactOpts(redact)
-  return Redact({
-    paths,
-    censor,
-    remove,
-    serialize: false
-  })
-}
-
 const _console = pfGlobalThisOrFallback().console || {}
 const stdSerializers = {
   mapHttpRequest: mock,
@@ -49,9 +24,6 @@ function levelToValue (level, logger) {
 const baseLogFunctionSymbol = Symbol('pino.logFuncs')
 const hierarchySymbol = Symbol('pino.hierarchy')
 
-const ownBindingsSymbol = Symbol('pino.ownBindings')
-const bindingsSymbol = Symbol('pino.bindings')
-
 const logFallbackMap = {
   error: 'log',
   fatal: 'error',
@@ -125,8 +97,6 @@ function pino (opts) {
   // setup root hierarchy entry
   appendChildLogger({}, logger)
 
-  logger[bindingsSymbol] = {}
-
   Object.defineProperty(logger, 'levelVal', {
     get: getLevelVal
   })
@@ -135,8 +105,6 @@ function pino (opts) {
     set: setLevel
   })
 
-  const redactFn = buildRedactFn(opts.redact)
-
   const setOpts = {
     transmit,
     serialize,
@@ -147,8 +115,7 @@ function pino (opts) {
     levels,
     timestamp: getTimeFunction(opts),
     messageKey: opts.messageKey || 'msg',
-    onChild: opts.onChild || noop,
-    redactFn
+    onChild: opts.onChild || noop
   }
   logger.levels = getLevels(opts)
   logger.level = level
@@ -172,21 +139,6 @@ function pino (opts) {
   logger._stdErrSerialize = stdErrSerialize
   logger.child = function (...args) { return child.call(this, setOpts, ...args) }
 
-  logger.bindings = function () {
-    return Object.assign({}, this[bindingsSymbol])
-  }
-
-  logger.setBindings = function (newBindings) {
-    this[ownBindingsSymbol] = Object.assign({}, this[ownBindingsSymbol], newBindings)
-    this[bindingsSymbol] = Object.assign({}, this[bindingsSymbol], newBindings)
-    if (this._logEvent) {
-      this._logEvent.bindings.push(newBindings)
-    }
-    // reassigning the level rebuilds the log functions so the updated
-    // bindings are prepended to subsequent log calls
-    this.level = this._level
-  }
-
   if (transmit) logger._logEvent = createLogEventShape()
 
   function getLevelVal () {
@@ -235,13 +187,7 @@ function pino (opts) {
       this._childLevel = (parent._childLevel | 0) + 1
 
       // make sure bindings are available in the `set` function
-      this[ownBindingsSymbol] = bindings
-
-      this[bindingsSymbol] = Object.assign(
-        {},
-        parent[bindingsSymbol],
-        bindings
-      )
+      this.bindings = bindings
 
       if (childSerializers) {
         this.serializers = childSerializers
@@ -312,16 +258,16 @@ pino.stdTimeFunctions = Object.assign({}, { nullTime, epochTime, unixTime, isoTi
 
 function getBindingChain (logger) {
   const bindings = []
-  if (logger[ownBindingsSymbol]) {
-    bindings.push(logger[ownBindingsSymbol])
+  if (logger.bindings) {
+    bindings.push(logger.bindings)
   }
 
   // traverse up the tree to get all bindings
   let hierarchy = logger[hierarchySymbol]
   while (hierarchy.parent) {
     hierarchy = hierarchy.parent
-    if (hierarchy.logger[ownBindingsSymbol]) {
-      bindings.push(hierarchy.logger[ownBindingsSymbol])
+    if (hierarchy.logger.bindings) {
+      bindings.push(hierarchy.logger.bindings)
     }
   }
 
@@ -447,10 +393,7 @@ function asObject (logger, level, args, ts, opts) {
       }
     }
 
-    let formattedLogObject = logObjectFormatter(logObject)
-    if (opts.redactFn) {
-      formattedLogObject = opts.redactFn(formattedLogObject)
-    }
+    const formattedLogObject = logObjectFormatter(logObject)
     return [formattedLogObject, ...argsCloned]
   } else {
     // deliberate, catching objects, arrays
@@ -462,10 +405,7 @@ function asObject (logger, level, args, ts, opts) {
     } else if (typeof msg === 'string') msg = format(argsCloned.shift(), argsCloned)
     if (msg !== undefined) logObject[opts.messageKey] = msg
 
-    let formattedLogObject = logObjectFormatter(logObject)
-    if (opts.redactFn) {
-      formattedLogObject = opts.redactFn(formattedLogObject)
-    }
+    const formattedLogObject = logObjectFormatter(logObject)
     return [formattedLogObject]
   }
 }