storybook 10.0.0-beta.0 → 10.0.0-beta.10

package/dist/_browser-chunks/{WithTooltip-2E62HIBN.js → WithTooltip-SK46ZJ2J.js}

@@ -1,7 +1,7 @@
 import {
   WithToolTipState,
   WithTooltipPure
-} from "./chunk-FWKO3E35.js";
+} from "./chunk-BOOOPFZF.js";
 import "./chunk-VAMFPZY3.js";
 import "./chunk-MH6AXFXB.js";
 import "./chunk-NVV6MIOE.js";

package/dist/_browser-chunks/{chunk-YY5GICNT.js → chunk-6E2SHJSL.js}

@@ -1,9 +1,9 @@
 import {
   mapValues
-} from "./chunk-E7VLET3C.js";
+} from "./chunk-QK3L5AXO.js";
 import {
   isPlainObject
-} from "./chunk-4QPX7WIQ.js";
+} from "./chunk-JJZMHC3A.js";
 import {
   __commonJS,
   __name,
@@ -206,7 +206,9 @@ var require_dist = __commonJS({
         makeKeyWordRule("new"),
         makeKeyWordRule("module"),
         makeKeyWordRule("event"),
+        makeKeyWordRule("extends"),
         makeKeyWordRule("external"),
+        makeKeyWordRule("infer"),
         makeKeyWordRule("typeof"),
         makeKeyWordRule("keyof"),
         makeKeyWordRule("readonly"),
@@ -258,7 +260,7 @@ var require_dist = __commonJS({
         if (result === void 0) {
           throw new Error("Unexpected undefined");
         }
-        if (result.type === "JsdocTypeKeyValue" || result.type === "JsdocTypeParameterList" || result.type === "JsdocTypeProperty" || result.type === "JsdocTypeReadonlyProperty" || result.type === "JsdocTypeObjectField" || result.type === "JsdocTypeJsdocObjectField" || result.type === "JsdocTypeIndexSignature" || result.type === "JsdocTypeMappedType") {
+        if (result.type === "JsdocTypeKeyValue" || result.type === "JsdocTypeParameterList" || result.type === "JsdocTypeProperty" || result.type === "JsdocTypeReadonlyProperty" || result.type === "JsdocTypeObjectField" || result.type === "JsdocTypeJsdocObjectField" || result.type === "JsdocTypeIndexSignature" || result.type === "JsdocTypeMappedType" || result.type === "JsdocTypeTypeParameter") {
           throw new UnexpectedTypeError(result);
         }
         return result;
@@ -299,6 +301,16 @@ var require_dist = __commonJS({
         return result;
       }
       __name(assertNumberOrVariadicNameResult, "assertNumberOrVariadicNameResult");
+      function assertArrayOrTupleResult(result) {
+        if (result.type === "JsdocTypeTuple") {
+          return result;
+        }
+        if (result.type === "JsdocTypeGeneric" && result.meta.brackets === "square") {
+          return result;
+        }
+        throw new UnexpectedTypeError(result);
+      }
+      __name(assertArrayOrTupleResult, "assertArrayOrTupleResult");
       function isSquaredProperty(result) {
         return result.type === "JsdocTypeIndexSignature" || result.type === "JsdocTypeMappedType";
       }
@@ -413,7 +425,7 @@ var require_dist = __commonJS({
       __name(_Parser, "Parser");
       let Parser = _Parser;
       function isQuestionMarkUnknownType(next) {
-        return next === "EOF" || next === "|" || next === "," || next === ")" || next === ">";
+        return next === "}" || next === "EOF" || next === "|" || next === "," || next === ")" || next === ">";
       }
       __name(isQuestionMarkUnknownType, "isQuestionMarkUnknownType");
       const nullableParslet = /* @__PURE__ */ __name((parser, precedence, left) => {
@@ -600,7 +612,7 @@ var require_dist = __commonJS({
                 const next = parser.parseIntermediateType(Precedence.PARAMETER_LIST);
                 elements.push(assertPlainKeyValueOrRootResult(next));
               } catch (e) {
-                if (allowTrailingComma && e instanceof NoParsletFoundError) {
+                if (e instanceof NoParsletFoundError) {
                   break;
                 } else {
                   throw e;
@@ -626,21 +638,26 @@ var require_dist = __commonJS({
           const dot = parser.consume(".");
           parser.consume("<");
           const objects = [];
-          do {
-            objects.push(parser.parseType(Precedence.PARAMETER_LIST));
-          } while (parser.consume(","));
+          let infer = false;
+          if (parser.consume("infer")) {
+            infer = true;
+            const left2 = parser.parseIntermediateType(Precedence.SYMBOL);
+            if (left2.type !== "JsdocTypeName") {
+              throw new UnexpectedTypeError(left2, "A typescript asserts always has to have a name on the left side.");
+            }
+            objects.push(left2);
+          } else {
+            do {
+              objects.push(parser.parseType(Precedence.PARAMETER_LIST));
+            } while (parser.consume(","));
+          }
           if (!parser.consume(">")) {
             throw new Error("Unterminated generic parameter list");
           }
-          return {
-            type: "JsdocTypeGeneric",
-            left: assertRootResult(left),
-            elements: objects,
-            meta: {
-              brackets: "angle",
-              dot
-            }
-          };
+          return Object.assign(Object.assign({ type: "JsdocTypeGeneric", left: assertRootResult(left), elements: objects }, infer ? { infer: true } : {}), { meta: {
+            brackets: "angle",
+            dot
+          } });
         }, "parseInfix")
       });
       const unionParslet = composeParslet({
@@ -1068,6 +1085,7 @@ var require_dist = __commonJS({
                 }
                 if (parser.lexer.current.startOfLine) {
                   separator = "linebreak";
+                  parser.consume(",") || parser.consume(";");
                 } else if (parser.consume(",")) {
                   separator = "comma";
                 } else if (parser.consume(";")) {
@@ -1081,6 +1099,9 @@ var require_dist = __commonJS({
                 }
               }
               result.meta.separator = separator !== null && separator !== void 0 ? separator : "comma";
+              if (separator === "linebreak") {
+                result.meta.propertyIndent = "  ";
+              }
               if (!parser.consume("}")) {
                 throw new Error("Unterminated record type. Missing '}'");
               }
@@ -1214,7 +1235,7 @@ var require_dist = __commonJS({
           // we leave out the object type deliberately
           objectFieldGrammar: [
             createNameParslet({
-              allowedAdditionalTokens: ["module", "in"]
+              allowedAdditionalTokens: ["typeof", "module", "in"]
             }),
             createObjectFieldParslet({
               allowSquaredProperties: false,
@@ -1238,13 +1259,13 @@ var require_dist = __commonJS({
           parser.consume("typeof");
           return {
             type: "JsdocTypeTypeof",
-            element: assertRootResult(parser.parseType(Precedence.KEY_OF_TYPE_OF))
+            element: parser.parseType(Precedence.KEY_OF_TYPE_OF)
           };
         }, "parsePrefix")
       });
       const objectFieldGrammar$1 = [
         createNameParslet({
-          allowedAdditionalTokens: ["module", "keyof", "event", "external", "in"]
+          allowedAdditionalTokens: ["typeof", "module", "keyof", "event", "external", "in"]
         }),
         nullableParslet,
         optionalParslet,
@@ -1305,7 +1326,12 @@ var require_dist = __commonJS({
           if (left.type !== "JsdocTypeName") {
             throw new UnexpectedTypeError(left, "A typescript asserts always has to have a name on the left side.");
           }
-          parser.consume("is");
+          if (!parser.consume("is")) {
+            return {
+              type: "JsdocTypeAssertsPlain",
+              element: left
+            };
+          }
           return {
             type: "JsdocTypeAsserts",
             left,
@@ -1343,7 +1369,7 @@ var require_dist = __commonJS({
             if (!parser.consume("]")) {
               throw new Error("Unterminated '['");
             }
-            if (!allowQuestionMark && result.elements.some((e) => e.type === "JsdocTypeUnknown")) {
+            if (result.elements.some((e) => e.type === "JsdocTypeUnknown")) {
               throw new Error("Question mark in tuple not allowed");
             }
             return result;
@@ -1390,7 +1416,7 @@ var require_dist = __commonJS({
           parser.consume("readonly");
           return {
             type: "JsdocTypeReadonlyProperty",
-            element: parser.parseType(Precedence.KEY_VALUE)
+            element: parser.parseIntermediateType(Precedence.KEY_VALUE)
           };
         }, "parsePrefix")
       });
@@ -1410,6 +1436,50 @@ var require_dist = __commonJS({
           };
         }, "parseInfix")
       });
+      const genericArrowFunctionParslet = composeParslet({
+        name: "genericArrowFunctionParslet",
+        accept: /* @__PURE__ */ __name((type) => type === "<", "accept"),
+        parsePrefix: /* @__PURE__ */ __name((parser) => {
+          const typeParameters = [];
+          parser.consume("<");
+          do {
+            let defaultValue;
+            let name = parser.parseIntermediateType(Precedence.SYMBOL);
+            if (name.type === "JsdocTypeOptional") {
+              name = name.element;
+              defaultValue = parser.parseType(Precedence.SYMBOL);
+            }
+            if (name.type !== "JsdocTypeName") {
+              throw new UnexpectedTypeError(name);
+            }
+            let constraint;
+            if (parser.consume("extends")) {
+              constraint = parser.parseType(Precedence.SYMBOL);
+              if (constraint.type === "JsdocTypeOptional") {
+                constraint = constraint.element;
+                defaultValue = parser.parseType(Precedence.SYMBOL);
+              }
+            }
+            const typeParameter = {
+              type: "JsdocTypeTypeParameter",
+              name
+            };
+            if (constraint !== void 0) {
+              typeParameter.constraint = constraint;
+            }
+            if (defaultValue !== void 0) {
+              typeParameter.defaultValue = defaultValue;
+            }
+            typeParameters.push(typeParameter);
+            if (parser.consume(">")) {
+              break;
+            }
+          } while (parser.consume(","));
+          const functionBase = parser.parseIntermediateType(Precedence.SYMBOL);
+          functionBase.typeParameters = typeParameters;
+          return functionBase;
+        }, "parsePrefix")
+      });
       const intersectionParslet = composeParslet({
         name: "intersectionParslet",
         accept: /* @__PURE__ */ __name((type) => type === "&", "accept"),
@@ -1480,10 +1550,39 @@ var require_dist = __commonJS({
           return result;
         }, "parsePrefix")
       });
+      const readonlyArrayParslet = composeParslet({
+        name: "readonlyArrayParslet",
+        accept: /* @__PURE__ */ __name((type) => type === "readonly", "accept"),
+        parsePrefix: /* @__PURE__ */ __name((parser) => {
+          parser.consume("readonly");
+          return {
+            type: "JsdocTypeReadonlyArray",
+            element: assertArrayOrTupleResult(parser.parseIntermediateType(Precedence.ALL))
+          };
+        }, "parsePrefix")
+      });
+      const conditionalParslet = composeParslet({
+        name: "conditionalParslet",
+        precedence: Precedence.INFIX,
+        accept: /* @__PURE__ */ __name((type) => type === "extends", "accept"),
+        parseInfix: /* @__PURE__ */ __name((parser, left) => {
+          parser.consume("extends");
+          const extendsType = parser.parseType(Precedence.KEY_OF_TYPE_OF).element;
+          const trueType = parser.parseType(Precedence.INFIX);
+          parser.consume(":");
+          return {
+            type: "JsdocTypeConditional",
+            checksType: assertRootResult(left),
+            extendsType,
+            trueType,
+            falseType: parser.parseType(Precedence.INFIX)
+          };
+        }, "parseInfix")
+      });
       const objectFieldGrammar = [
         readonlyPropertyParslet,
         createNameParslet({
-          allowedAdditionalTokens: ["module", "event", "keyof", "event", "external", "in"]
+          allowedAdditionalTokens: ["typeof", "module", "keyof", "event", "external", "in"]
         }),
         nullableParslet,
         optionalParslet,
@@ -1503,6 +1602,7 @@ var require_dist = __commonJS({
           allowKeyTypes: false,
           objectFieldGrammar
         }),
+        readonlyArrayParslet,
         typeOfParslet,
         keyOfParslet,
         importParslet,
@@ -1521,6 +1621,7 @@ var require_dist = __commonJS({
           allowPostfix: false
         }),
         assertsParslet,
+        conditionalParslet,
         createNameParslet({
           allowedAdditionalTokens: ["event", "external", "in"]
         }),
@@ -1530,6 +1631,7 @@ var require_dist = __commonJS({
         }),
         arrayBracketsParslet,
         arrowFunctionParslet,
+        genericArrowFunctionParslet,
         createNamePathParslet({
           allowSquareBracketsOnAnyType: true,
           allowJsdocNamePaths: false,
@@ -1617,6 +1719,7 @@ var require_dist = __commonJS({
           JsdocTypeParenthesis: /* @__PURE__ */ __name((result, transform2) => `(${result.element !== void 0 ? transform2(result.element) : ""})`, "JsdocTypeParenthesis"),
           JsdocTypeKeyof: /* @__PURE__ */ __name((result, transform2) => `keyof ${transform2(result.element)}`, "JsdocTypeKeyof"),
           JsdocTypeFunction: /* @__PURE__ */ __name((result, transform2) => {
+            var _a;
             if (!result.arrow) {
               let stringified = result.constructor ? "new" : "function";
               if (!result.parenthesis) {
@@ -1631,7 +1734,7 @@ var require_dist = __commonJS({
               if (result.returnType === void 0) {
                 throw new Error("Arrow function needs a return type.");
               }
-              let stringified = `(${result.parameters.map(transform2).join(", ")}) => ${transform2(result.returnType)}`;
+              let stringified = `${result.typeParameters !== void 0 ? `<${(_a = result.typeParameters.map(transform2).join(", ")) !== null && _a !== void 0 ? _a : ""}>` : ""}(${result.parameters.map(transform2).join(", ")}) => ${transform2(result.returnType)}`;
               if (result.constructor) {
                 stringified = "new " + stringified;
               }
@@ -1667,7 +1770,7 @@ var require_dist = __commonJS({
                 return `${transformed}[]`;
               }
             } else {
-              return `${transform2(result.left)}${result.meta.dot ? "." : ""}<${result.elements.map(transform2).join(", ")}>`;
+              return `${transform2(result.left)}${result.meta.dot ? "." : ""}<${result.infer === true ? "infer " : ""}${result.elements.map(transform2).join(", ")}>`;
             }
           }, "JsdocTypeGeneric"),
           JsdocTypeImport: /* @__PURE__ */ __name((result, transform2) => `import(${transform2(result.element)})`, "JsdocTypeImport"),
@@ -1712,7 +1815,10 @@ var require_dist = __commonJS({
           JsdocTypeNull: /* @__PURE__ */ __name(() => "null", "JsdocTypeNull"),
           JsdocTypeNullable: /* @__PURE__ */ __name((result, transform2) => applyPosition(result.meta.position, transform2(result.element), "?"), "JsdocTypeNullable"),
           JsdocTypeNumber: /* @__PURE__ */ __name((result) => result.value.toString(), "JsdocTypeNumber"),
-          JsdocTypeObject: /* @__PURE__ */ __name((result, transform2) => `{${result.elements.map(transform2).join((result.meta.separator === "comma" ? "," : ";") + " ")}}`, "JsdocTypeObject"),
+          JsdocTypeObject: /* @__PURE__ */ __name((result, transform2) => {
+            var _a, _b;
+            return `{${(result.meta.separator === "linebreak" && result.elements.length > 1 ? "\n" + ((_a = result.meta.propertyIndent) !== null && _a !== void 0 ? _a : "") : "") + result.elements.map(transform2).join(result.meta.separator === "comma" ? ", " : result.meta.separator === "linebreak" ? "\n" + ((_b = result.meta.propertyIndent) !== null && _b !== void 0 ? _b : "") : "; ") + (result.meta.separator === "linebreak" && result.elements.length > 1 ? "\n" : "")}}`;
+          }, "JsdocTypeObject"),
           JsdocTypeOptional: /* @__PURE__ */ __name((result, transform2) => applyPosition(result.meta.position, transform2(result.element), "="), "JsdocTypeOptional"),
           JsdocTypeSymbol: /* @__PURE__ */ __name((result, transform2) => `${result.value}(${result.element !== void 0 ? transform2(result.element) : ""})`, "JsdocTypeSymbol"),
           JsdocTypeTypeof: /* @__PURE__ */ __name((result, transform2) => `typeof ${transform2(result.element)}`, "JsdocTypeTypeof"),
@@ -1724,7 +1830,11 @@ var require_dist = __commonJS({
           JsdocTypePredicate: /* @__PURE__ */ __name((result, transform2) => `${transform2(result.left)} is ${transform2(result.right)}`, "JsdocTypePredicate"),
           JsdocTypeIndexSignature: /* @__PURE__ */ __name((result, transform2) => `[${result.key}: ${transform2(result.right)}]`, "JsdocTypeIndexSignature"),
           JsdocTypeMappedType: /* @__PURE__ */ __name((result, transform2) => `[${result.key} in ${transform2(result.right)}]`, "JsdocTypeMappedType"),
-          JsdocTypeAsserts: /* @__PURE__ */ __name((result, transform2) => `asserts ${transform2(result.left)} is ${transform2(result.right)}`, "JsdocTypeAsserts")
+          JsdocTypeAsserts: /* @__PURE__ */ __name((result, transform2) => `asserts ${transform2(result.left)} is ${transform2(result.right)}`, "JsdocTypeAsserts"),
+          JsdocTypeReadonlyArray: /* @__PURE__ */ __name((result, transform2) => `readonly ${transform2(result.element)}`, "JsdocTypeReadonlyArray"),
+          JsdocTypeAssertsPlain: /* @__PURE__ */ __name((result, transform2) => `asserts ${transform2(result.element)}`, "JsdocTypeAssertsPlain"),
+          JsdocTypeConditional: /* @__PURE__ */ __name((result, transform2) => `${transform2(result.checksType)} extends ${transform2(result.extendsType)} ? ${transform2(result.trueType)} : ${transform2(result.falseType)}`, "JsdocTypeConditional"),
+          JsdocTypeTypeParameter: /* @__PURE__ */ __name((result, transform2) => `${transform2(result.name)}${result.constraint !== void 0 ? ` extends ${transform2(result.constraint)}` : ""}${result.defaultValue !== void 0 ? ` = ${transform2(result.defaultValue)}` : ""}`, "JsdocTypeTypeParameter")
         };
       }
       __name(stringifyRules2, "stringifyRules");
@@ -1940,7 +2050,11 @@ var require_dist = __commonJS({
         JsdocTypeIntersection: notAvailableTransform,
         JsdocTypeProperty: notAvailableTransform,
         JsdocTypePredicate: notAvailableTransform,
-        JsdocTypeAsserts: notAvailableTransform
+        JsdocTypeAsserts: notAvailableTransform,
+        JsdocTypeReadonlyArray: notAvailableTransform,
+        JsdocTypeAssertsPlain: notAvailableTransform,
+        JsdocTypeConditional: notAvailableTransform,
+        JsdocTypeTypeParameter: notAvailableTransform
       };
       function catharsisTransform(result) {
         return transform(catharsisTransformRules, result);
@@ -2244,7 +2358,11 @@ var require_dist = __commonJS({
         JsdocTypePredicate: notAvailableTransform,
         JsdocTypeMappedType: notAvailableTransform,
         JsdocTypeIndexSignature: notAvailableTransform,
-        JsdocTypeAsserts: notAvailableTransform
+        JsdocTypeAsserts: notAvailableTransform,
+        JsdocTypeReadonlyArray: notAvailableTransform,
+        JsdocTypeAssertsPlain: notAvailableTransform,
+        JsdocTypeConditional: notAvailableTransform,
+        JsdocTypeTypeParameter: notAvailableTransform
       };
       function jtpTransform(result) {
         return transform(jtpRules, result);
@@ -2398,7 +2516,28 @@ var require_dist = __commonJS({
             type: "JsdocTypeAsserts",
             left: transform2(result.left),
             right: transform2(result.right)
-          }), "JsdocTypeAsserts")
+          }), "JsdocTypeAsserts"),
+          JsdocTypeReadonlyArray: /* @__PURE__ */ __name((result, transform2) => ({
+            type: "JsdocTypeReadonlyArray",
+            element: transform2(result.element)
+          }), "JsdocTypeReadonlyArray"),
+          JsdocTypeAssertsPlain: /* @__PURE__ */ __name((result, transform2) => ({
+            type: "JsdocTypeAssertsPlain",
+            element: transform2(result.element)
+          }), "JsdocTypeAssertsPlain"),
+          JsdocTypeConditional: /* @__PURE__ */ __name((result, transform2) => ({
+            type: "JsdocTypeConditional",
+            checksType: transform2(result.checksType),
+            extendsType: transform2(result.extendsType),
+            trueType: transform2(result.trueType),
+            falseType: transform2(result.falseType)
+          }), "JsdocTypeConditional"),
+          JsdocTypeTypeParameter: /* @__PURE__ */ __name((result, transform2) => ({
+            type: "JsdocTypeTypeParameter",
+            name: transform2(result.name),
+            constraint: result.constraint !== void 0 ? transform2(result.constraint) : void 0,
+            defaultValue: result.defaultValue !== void 0 ? transform2(result.defaultValue) : void 0
+          }), "JsdocTypeTypeParameter")
         };
       }
       __name(identityTransformRules, "identityTransformRules");
@@ -2434,7 +2573,11 @@ var require_dist = __commonJS({
         JsdocTypeVariadic: ["element"],
         JsdocTypeProperty: [],
         JsdocTypePredicate: ["left", "right"],
-        JsdocTypeAsserts: ["left", "right"]
+        JsdocTypeAsserts: ["left", "right"],
+        JsdocTypeReadonlyArray: ["element"],
+        JsdocTypeAssertsPlain: ["element"],
+        JsdocTypeConditional: ["checksType", "extendsType", "trueType", "falseType"],
+        JsdocTypeTypeParameter: ["name", "constraint", "defaultValue"]
       };
       function _traverse(node, parentNode, property, onEnter, onLeave) {
         onEnter === null || onEnter === void 0 ? void 0 : onEnter(node, parentNode, property);

package/dist/_browser-chunks/{chunk-FWKO3E35.js → chunk-BOOOPFZF.js}

@@ -2226,6 +2226,7 @@ var WithTooltipPure = /* @__PURE__ */ __name(({
   strategy,
   followCursor,
   onVisibleChange,
+  portalContainer,
   ...props
 }) => {
   const Container = svg ? TargetSvgContainer : TargetContainer;
@@ -2257,6 +2258,7 @@ var WithTooltipPure = /* @__PURE__ */ __name(({
       strategy
     }
   );
+  const portalTarget = (typeof portalContainer === "string" ? document2.querySelector(portalContainer) : portalContainer) || document2.body;
   const tooltipComponent = isVisible ? React8.createElement(
     Tooltip,
     {
@@ -2269,7 +2271,7 @@ var WithTooltipPure = /* @__PURE__ */ __name(({
     },
     typeof tooltip === "function" ? tooltip({ onHide: /* @__PURE__ */ __name(() => onVisibleChange(false), "onHide") }) : tooltip
   ) : null;
-  return React8.createElement(React8.Fragment, null, React8.createElement(Container, { trigger, ref: setTriggerRef, ...props }, children), isVisible && ReactDOM2.createPortal(tooltipComponent, document2.body));
+  return React8.createElement(React8.Fragment, null, React8.createElement(Container, { trigger, ref: setTriggerRef, ...props }, children), isVisible && ReactDOM2.createPortal(tooltipComponent, portalTarget));
 }, "WithTooltipPure");
 var WithToolTipState = /* @__PURE__ */ __name(({
   startOpen = false,
@@ -2288,7 +2290,12 @@ var WithToolTipState = /* @__PURE__ */ __name(({
   );
   useEffect6(() => {
     const hide2 = /* @__PURE__ */ __name(() => onVisibilityChange(false), "hide");
-    document2.addEventListener("keydown", hide2, false);
+    const handleKeyDown = /* @__PURE__ */ __name((e) => {
+      if (e.key === "Escape") {
+        hide2();
+      }
+    }, "handleKeyDown");
+    document2.addEventListener("keydown", handleKeyDown, false);
     const iframes = Array.from(document2.getElementsByTagName("iframe"));
     const unbinders = [];
     iframes.forEach((iframe) => {
@@ -2313,7 +2320,7 @@ var WithToolTipState = /* @__PURE__ */ __name(({
       });
     });
     return () => {
-      document2.removeEventListener("keydown", hide2);
+      document2.removeEventListener("keydown", handleKeyDown);
       unbinders.forEach((unbind) => {
         unbind();
       });

package/dist/_browser-chunks/{chunk-YWDKX534.js → chunk-FA42P6MO.js}

@@ -1,6 +1,11 @@
 import {
-  isObjectLike
-} from "./chunk-E7VLET3C.js";
+  cloneDeep,
+  isObjectLike,
+  isUnsafeProperty
+} from "./chunk-QK3L5AXO.js";
+import {
+  isPlainObject
+} from "./chunk-JJZMHC3A.js";
 import {
   __name
 } from "./chunk-MM7DTO55.js";
@@ -10,10 +15,13 @@ function mergeWith(target, source, merge2) {
   const sourceKeys = Object.keys(source);
   for (let i = 0; i < sourceKeys.length; i++) {
     const key = sourceKeys[i];
+    if (isUnsafeProperty(key)) {
+      continue;
+    }
     const sourceValue = source[key];
     const targetValue = target[key];
     const merged = merge2(targetValue, sourceValue, key, target, source);
-    if (merged != null) {
+    if (merged !== void 0) {
       target[key] = merged;
     } else if (Array.isArray(sourceValue)) {
       target[key] = mergeWith(targetValue ?? [], sourceValue, merge2);
@@ -55,8 +63,45 @@ function pickBy(obj, shouldPick) {
 }
 __name(pickBy, "pickBy");
 
+// ../node_modules/es-toolkit/dist/object/merge.mjs
+function merge(target, source) {
+  const sourceKeys = Object.keys(source);
+  for (let i = 0; i < sourceKeys.length; i++) {
+    const key = sourceKeys[i];
+    if (isUnsafeProperty(key)) {
+      continue;
+    }
+    const sourceValue = source[key];
+    const targetValue = target[key];
+    if (Array.isArray(sourceValue)) {
+      if (Array.isArray(targetValue)) {
+        target[key] = merge(targetValue, sourceValue);
+      } else {
+        target[key] = merge([], sourceValue);
+      }
+    } else if (isPlainObject(sourceValue)) {
+      if (isPlainObject(targetValue)) {
+        target[key] = merge(targetValue, sourceValue);
+      } else {
+        target[key] = merge({}, sourceValue);
+      }
+    } else if (targetValue === void 0 || sourceValue !== void 0) {
+      target[key] = sourceValue;
+    }
+  }
+  return target;
+}
+__name(merge, "merge");
+
+// ../node_modules/es-toolkit/dist/object/toMerged.mjs
+function toMerged(target, source) {
+  return merge(cloneDeep(target), source);
+}
+__name(toMerged, "toMerged");
+
 export {
   mergeWith,
   pick,
-  pickBy
+  pickBy,
+  toMerged
 };