one 1.17.10 → 1.17.11

package/dist/esm/router/web/__tests__/WebStackView.test.native.js

@@ -0,0 +1,513 @@
+import { describe, expect, it, vi } from "vitest";
+import { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { OverlayHost, resolveOverlayRender, WebStackView } from "../WebStackView.native.js";
+import { StackRenderProvider } from "../ScreenRenderContext.native.js";
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function makeRoute(name) {
+  return {
+    key: `${name}-key`,
+    name,
+    params: void 0
+  };
+}
+function makeState(names, index) {
+  return {
+    key: "stack-1",
+    index,
+    routeNames: names,
+    routes: names.map(makeRoute),
+    type: "stack",
+    stale: false,
+    preloadedRoutes: []
+  };
+}
+function makeDescriptors(perRoute) {
+  var out = {};
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    var _loop = function () {
+      var name = _step.value;
+      out[`${name}-key`] = {
+        options: perRoute[name].options,
+        render: function () {
+          var _perRoute_name_content;
+          return (_perRoute_name_content = perRoute[name].content) !== null && _perRoute_name_content !== void 0 ? _perRoute_name_content : null;
+        },
+        navigation: {}
+      };
+    };
+    for (var _iterator = Object.keys(perRoute)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return out;
+}
+describe("resolveOverlayRender", function () {
+  var A = function () {
+    return null;
+  };
+  var B = function () {
+    return null;
+  };
+  it("prefers per-route render over context", function () {
+    var result = resolveOverlayRender({
+      presentation: "formSheet",
+      render: {
+        web: A
+      }
+    }, {
+      web: B
+    });
+    expect(result).toBe(A);
+  });
+  it("falls back to context render when route has none", function () {
+    var result = resolveOverlayRender({
+      presentation: "formSheet"
+    }, {
+      web: B
+    });
+    expect(result).toBe(B);
+  });
+  it("returns undefined when nothing is configured", function () {
+    expect(resolveOverlayRender({
+      presentation: "formSheet"
+    }, void 0)).toBeUndefined();
+    expect(resolveOverlayRender({
+      presentation: "formSheet"
+    }, {
+      ios: A
+    })).toBeUndefined();
+  });
+  it("does not pick from ios/android slots on web", function () {
+    expect(resolveOverlayRender({
+      presentation: "formSheet",
+      render: {
+        ios: A
+      }
+    }, {
+      web: B
+    })).toBe(B);
+  });
+});
+describe("OverlayHost", function () {
+  it("invokes the render component with route props for overlay presentations", function () {
+    var captured = [];
+    var Render = vi.fn(function (props) {
+      captured.push(props);
+      return /* @__PURE__ */createElement("div", {
+        "data-modal": props.routeKey
+      }, props.children);
+    });
+    var descriptors = makeDescriptors({
+      filter: {
+        options: {
+          presentation: "formSheet",
+          sheetAllowedDetents: [0.5, 1],
+          sheetGrabberVisible: true
+        },
+        content: /* @__PURE__ */createElement("span", null, "filter-body")
+      }
+    });
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("filter"),
+      descriptor: descriptors["filter-key"],
+      contextRender: {
+        web: Render
+      },
+      onDismiss: function () {}
+    }));
+    expect(Render).toHaveBeenCalledTimes(1);
+    expect(captured[0]).toMatchObject({
+      routeKey: "filter-key",
+      presentation: "formSheet",
+      sheetAllowedDetents: [0.5, 1],
+      sheetGrabberVisible: true,
+      dismissible: true
+    });
+    expect(_type_of(captured[0].dismiss)).toBe("function");
+    expect(markup).toContain('data-modal="filter-key"');
+    expect(markup).toContain("filter-body");
+  });
+  it("falls back to inline rendering when no render is configured", function () {
+    var descriptors = makeDescriptors({
+      filter: {
+        options: {
+          presentation: "formSheet"
+        },
+        content: /* @__PURE__ */createElement("span", null, "inline-content")
+      }
+    });
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("filter"),
+      descriptor: descriptors["filter-key"],
+      contextRender: void 0,
+      onDismiss: function () {}
+    }));
+    expect(markup).toContain("inline-content");
+  });
+  it("skips render when presentation is not an overlay", function () {
+    var Render = vi.fn(function () {
+      return null;
+    });
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        },
+        content: /* @__PURE__ */createElement("span", null, "card-content")
+      }
+    });
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("home"),
+      descriptor: descriptors["home-key"],
+      contextRender: {
+        web: Render
+      },
+      onDismiss: function () {}
+    }));
+    expect(Render).not.toHaveBeenCalled();
+    expect(markup).toContain("card-content");
+  });
+  it("per-route render overrides context render", function () {
+    var ContextRender = vi.fn(function () {
+      return null;
+    });
+    var PerRoute = vi.fn(function () {
+      return /* @__PURE__ */createElement("em", null, "per-route");
+    });
+    var descriptors = makeDescriptors({
+      sheet: {
+        options: {
+          presentation: "formSheet",
+          render: {
+            web: PerRoute
+          }
+        },
+        content: /* @__PURE__ */createElement("span", null, "body")
+      }
+    });
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("sheet"),
+      descriptor: descriptors["sheet-key"],
+      contextRender: {
+        web: ContextRender
+      },
+      onDismiss: function () {}
+    }));
+    expect(PerRoute).toHaveBeenCalledTimes(1);
+    expect(ContextRender).not.toHaveBeenCalled();
+    expect(markup).toContain("per-route");
+  });
+  it("dismiss callback wraps the supplied onDismiss", function () {
+    var onDismiss = vi.fn();
+    var capturedDismiss;
+    var Render = function (props) {
+      capturedDismiss = props.dismiss;
+      return null;
+    };
+    var descriptors = makeDescriptors({
+      sheet: {
+        options: {
+          presentation: "formSheet"
+        }
+      }
+    });
+    renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("sheet"),
+      descriptor: descriptors["sheet-key"],
+      contextRender: {
+        web: Render
+      },
+      onDismiss
+    }));
+    expect(typeof capturedDismiss === "undefined" ? "undefined" : _type_of(capturedDismiss)).toBe("function");
+    capturedDismiss();
+    expect(onDismiss).toHaveBeenCalledTimes(1);
+  });
+  it("respects gestureEnabled: false as dismissible: false", function () {
+    var captured;
+    var Render = function (props) {
+      captured = props;
+      return null;
+    };
+    var descriptors = makeDescriptors({
+      sheet: {
+        options: {
+          presentation: "formSheet",
+          gestureEnabled: false
+        }
+      }
+    });
+    renderToStaticMarkup(/* @__PURE__ */createElement(OverlayHost, {
+      route: makeRoute("sheet"),
+      descriptor: descriptors["sheet-key"],
+      contextRender: {
+        web: Render
+      },
+      onDismiss: function () {}
+    }));
+    expect(captured.dismissible).toBe(false);
+  });
+});
+describe("WebStackView overlay dispatch", function () {
+  it("renders each overlay route via the configured render", function () {
+    var calls = [];
+    var Render = function (props) {
+      calls.push(props.routeKey);
+      return /* @__PURE__ */createElement("div", {
+        "data-route": props.routeKey
+      });
+    };
+    var state = makeState(["home", "filter", "help"], 2);
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        }
+      },
+      filter: {
+        options: {
+          presentation: "formSheet"
+        }
+      },
+      help: {
+        options: {
+          presentation: "modal"
+        }
+      }
+    });
+    var navigation = {
+      dispatch: vi.fn()
+    };
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(StackRenderProvider, {
+      value: {
+        web: Render
+      }
+    }, /* @__PURE__ */createElement(WebStackView, {
+      state,
+      navigation,
+      descriptors
+    })));
+    expect(calls).toEqual(["filter-key", "help-key"]);
+    expect(markup).toContain('data-route="filter-key"');
+    expect(markup).toContain('data-route="help-key"');
+  });
+  it("leaves overlay routes in the underlying NativeStackView when no render is configured", function () {
+    var state = makeState(["home", "filter"], 1);
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        }
+      },
+      filter: {
+        options: {
+          presentation: "formSheet"
+        },
+        content: /* @__PURE__ */createElement("span", null, "should-not-render-as-overlay")
+      }
+    });
+    var navigation = {
+      dispatch: vi.fn()
+    };
+    var markup = renderToStaticMarkup(/* @__PURE__ */createElement(WebStackView, {
+      state,
+      navigation,
+      descriptors
+    }));
+    expect(markup).not.toContain("should-not-render-as-overlay");
+  });
+  it("passes open: true to the regular overlay render", function () {
+    var captured;
+    var Render = function (props) {
+      captured = props;
+      return null;
+    };
+    var state = makeState(["home", "sheet"], 1);
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        }
+      },
+      sheet: {
+        options: {
+          presentation: "formSheet"
+        }
+      }
+    });
+    var navigation = {
+      dispatch: vi.fn()
+    };
+    renderToStaticMarkup(/* @__PURE__ */createElement(StackRenderProvider, {
+      value: {
+        web: Render
+      }
+    }, /* @__PURE__ */createElement(WebStackView, {
+      state,
+      navigation,
+      descriptors
+    })));
+    expect(captured.open).toBe(true);
+    expect(captured.routeName).toBe("sheet");
+  });
+  it("keepMounted: keeps rendering the route via the persistent slot after the route is popped", function () {
+    var calls = [];
+    var mountTrackerCalls = 0;
+    var Render = function (props) {
+      calls.push({
+        name: props.routeName,
+        open: props.open
+      });
+      return /* @__PURE__ */createElement("div", {
+        "data-route": props.routeName,
+        "data-open": String(props.open)
+      }, props.children);
+    };
+    var MountTracker = function () {
+      mountTrackerCalls++;
+      return /* @__PURE__ */createElement("span", null, `mounted-${mountTrackerCalls}`);
+    };
+    var initialState = makeState(["home", "settings"], 1);
+    var settingsDescriptor = {
+      options: {
+        presentation: "formSheet",
+        keepMounted: true
+      },
+      render: function () {
+        return /* @__PURE__ */createElement(MountTracker);
+      },
+      navigation: {}
+    };
+    var descriptors = {
+      "home-key": {
+        options: {
+          presentation: "card"
+        },
+        render: function () {
+          return null;
+        },
+        navigation: {}
+      },
+      "settings-key": settingsDescriptor
+    };
+    var navigation = {
+      dispatch: vi.fn()
+    };
+    var tree = /* @__PURE__ */createElement(StackRenderProvider, {
+      value: {
+        web: Render
+      }
+    }, /* @__PURE__ */createElement(WebStackView, {
+      state: initialState,
+      navigation,
+      descriptors
+    }));
+    var out1 = renderToStaticMarkup(tree);
+    expect(calls.some(function (c) {
+      return c.name === "settings" && c.open === true;
+    })).toBe(true);
+    expect(out1).toContain('data-route="settings"');
+    expect(out1).toContain('data-open="true"');
+    expect(calls).toHaveLength(1);
+  });
+  it("peels off only overlay routes with a render configured, leaving render-less overlays in the underlying view", function () {
+    var PerRoute = vi.fn(function () {
+      return /* @__PURE__ */createElement("div", {
+        "data-route": "filter"
+      });
+    });
+    var state = makeState(["home", "help", "filter"], 2);
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        }
+      },
+      help: {
+        options: {
+          presentation: "modal"
+        }
+      },
+      // overlay-presented, no render
+      filter: {
+        options: {
+          presentation: "formSheet",
+          render: {
+            web: PerRoute
+          }
+        }
+      }
+    });
+    var navigation = {
+      dispatch: vi.fn()
+    };
+    renderToStaticMarkup(/* @__PURE__ */createElement(WebStackView, {
+      state,
+      navigation,
+      descriptors
+    }));
+    expect(PerRoute).toHaveBeenCalledTimes(1);
+  });
+  it("dispatches a pop action when an overlay calls dismiss", function () {
+    var captured;
+    var Render = function (props) {
+      captured = props;
+      return null;
+    };
+    var state = makeState(["home", "filter"], 1);
+    var descriptors = makeDescriptors({
+      home: {
+        options: {
+          presentation: "card"
+        }
+      },
+      filter: {
+        options: {
+          presentation: "formSheet"
+        }
+      }
+    });
+    var dispatch = vi.fn();
+    var navigation = {
+      dispatch,
+      isFocused: function () {
+        return true;
+      }
+    };
+    renderToStaticMarkup(/* @__PURE__ */createElement(StackRenderProvider, {
+      value: {
+        web: Render
+      }
+    }, /* @__PURE__ */createElement(WebStackView, {
+      state,
+      navigation,
+      descriptors
+    })));
+    captured.dismiss();
+    expect(dispatch).toHaveBeenCalledTimes(1);
+    var action = dispatch.mock.calls[0][0];
+    expect(action.type).toBe("POP");
+    expect(action.source).toBe("filter-key");
+    expect(action.target).toBe("stack-1");
+  });
+});
+//# sourceMappingURL=WebStackView.test.native.js.map

package/dist/esm/router/web/__tests__/WebStackView.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","vi","createElement","renderToStaticMarkup","OverlayHost","resolveOverlayRender","WebStackView","StackRenderProvider","_type_of","obj","Symbol","constructor","makeRoute","name","key","params","makeState","names","index","routeNames","routes","map","type","stale","preloadedRoutes","makeDescriptors","perRoute","out","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","_step","value","options","render","_perRoute_name_content","content","navigation","_iterator","Object","keys","iterator","next","done","err","return","A","B","result","presentation","web","toBe","toBeUndefined","ios","captured","Render","fn","props","push","routeKey","children","descriptors","filter","sheetAllowedDetents","sheetGrabberVisible","markup","route","descriptor","contextRender","onDismiss","toHaveBeenCalledTimes","toMatchObject","dismissible","dismiss","toContain","home","not","toHaveBeenCalled","ContextRender","PerRoute","sheet","capturedDismiss","gestureEnabled","calls","state","help","dispatch","toEqual"],"sources":["../../../../../src/router/web/__tests__/WebStackView.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/web/__tests__/stackStateUtils.test.mjs

@@ -0,0 +1,135 @@
+import { describe, expect, it } from "vitest";
+import { convertStackStateToNonOverlayState, findLastNonOverlayIndex, isOverlayPresentation, isTransparentOverlay } from "../stackStateUtils.mjs";
+function makeState(routeNames, index) {
+  const routes = routeNames.map(name => ({
+    key: `${name}-key`,
+    name,
+    params: void 0
+  }));
+  return {
+    key: "stack",
+    index,
+    routeNames,
+    routes,
+    type: "stack",
+    stale: false,
+    preloadedRoutes: []
+  };
+}
+function makeDescriptors(routeNames, presentations) {
+  const out = {};
+  for (const name of routeNames) {
+    out[`${name}-key`] = {
+      options: {
+        presentation: presentations[name]
+      }
+    };
+  }
+  return out;
+}
+describe("isOverlayPresentation", () => {
+  it("returns true for known overlay presentations", () => {
+    for (const p of ["modal", "transparentModal", "fullScreenModal", "formSheet", "pageSheet", "containedModal", "containedTransparentModal"]) {
+      expect(isOverlayPresentation({
+        presentation: p
+      })).toBe(true);
+    }
+  });
+  it("returns false for card and undefined", () => {
+    expect(isOverlayPresentation({
+      presentation: "card"
+    })).toBe(false);
+    expect(isOverlayPresentation({})).toBe(false);
+    expect(isOverlayPresentation(void 0)).toBe(false);
+    expect(isOverlayPresentation(null)).toBe(false);
+  });
+});
+describe("isTransparentOverlay", () => {
+  it("flags transparent variants only", () => {
+    expect(isTransparentOverlay({
+      presentation: "transparentModal"
+    })).toBe(true);
+    expect(isTransparentOverlay({
+      presentation: "containedTransparentModal"
+    })).toBe(true);
+    expect(isTransparentOverlay({
+      presentation: "modal"
+    })).toBe(false);
+    expect(isTransparentOverlay({
+      presentation: "formSheet"
+    })).toBe(false);
+  });
+});
+describe("convertStackStateToNonOverlayState", () => {
+  it("removes overlay routes and keeps card routes", () => {
+    const state = makeState(["home", "detail", "filter"], 2);
+    const descriptors = makeDescriptors(["home", "detail", "filter"], {
+      home: "card",
+      detail: "card",
+      filter: "formSheet"
+    });
+    const out = convertStackStateToNonOverlayState(state, descriptors);
+    expect(out.routes.map(r => r.name)).toEqual(["home", "detail"]);
+  });
+  it("falls back to last remaining route when active route was an overlay", () => {
+    const state = makeState(["home", "detail", "filter"], 2);
+    const descriptors = makeDescriptors(["home", "detail", "filter"], {
+      home: "card",
+      detail: "card",
+      filter: "formSheet"
+    });
+    const out = convertStackStateToNonOverlayState(state, descriptors);
+    expect(out.index).toBe(1);
+    expect(out.routes[out.index].name).toBe("detail");
+  });
+  it("preserves active index when active route is not an overlay", () => {
+    const state = makeState(["home", "detail", "filter"], 1);
+    const descriptors = makeDescriptors(["home", "detail", "filter"], {
+      home: "card",
+      detail: "card",
+      filter: "formSheet"
+    });
+    const out = convertStackStateToNonOverlayState(state, descriptors);
+    expect(out.routes[out.index].name).toBe("detail");
+  });
+  it("does not strip mid-stack overlays (regression: only the trailing overlay suffix is removed)", () => {
+    const state = makeState(["home", "sheet", "detail"], 2);
+    const descriptors = makeDescriptors(["home", "sheet", "detail"], {
+      home: "card",
+      sheet: "formSheet",
+      detail: "card"
+    });
+    const out = convertStackStateToNonOverlayState(state, descriptors);
+    expect(out.routes.map(r => r.name)).toEqual(["home", "sheet", "detail"]);
+    expect(out.index).toBe(2);
+  });
+  it("handles all-overlay state without crashing", () => {
+    const state = makeState(["only-sheet"], 0);
+    const descriptors = makeDescriptors(["only-sheet"], {
+      "only-sheet": "formSheet"
+    });
+    const out = convertStackStateToNonOverlayState(state, descriptors);
+    expect(out.routes).toHaveLength(0);
+    expect(out.index).toBe(0);
+  });
+});
+describe("findLastNonOverlayIndex", () => {
+  it("returns the highest index that is not an overlay", () => {
+    const state = makeState(["home", "detail", "filter", "pop"], 3);
+    const descriptors = makeDescriptors(["home", "detail", "filter", "pop"], {
+      home: "card",
+      detail: "card",
+      filter: "formSheet",
+      pop: "transparentModal"
+    });
+    expect(findLastNonOverlayIndex(state, descriptors)).toBe(1);
+  });
+  it("returns -1 when every route is an overlay", () => {
+    const state = makeState(["sheet"], 0);
+    const descriptors = makeDescriptors(["sheet"], {
+      sheet: "formSheet"
+    });
+    expect(findLastNonOverlayIndex(state, descriptors)).toBe(-1);
+  });
+});
+//# sourceMappingURL=stackStateUtils.test.mjs.map

package/dist/esm/router/web/__tests__/stackStateUtils.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","convertStackStateToNonOverlayState","findLastNonOverlayIndex","isOverlayPresentation","isTransparentOverlay","makeState","routeNames","index","routes","map","name","key","params","type","stale","preloadedRoutes","makeDescriptors","presentations","out","options","presentation","p","toBe","state","descriptors","home","detail","filter","r","toEqual","sheet","toHaveLength","pop"],"sources":["../../../../../src/router/web/__tests__/stackStateUtils.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AAIrC,SACEC,kCAAA,EACAC,uBAAA,EACAC,qBAAA,EACAC,oBAAA,QACK;AAIP,SAASC,UACPC,UAAA,EACAC,KAAA,EACqC;EACrC,MAAMC,MAAA,GAASF,UAAA,CAAWG,GAAA,CAAKC,IAAA,KAAU;IACvCC,GAAA,EAAK,GAAGD,IAAI;IACZA,IAAA;IACAE,MAAA,EAAQ;EACV,EAAE;EACF,OAAO;IACLD,GAAA,EAAK;IACLJ,KAAA;IACAD,UAAA;IACAE,MAAA;IACAK,IAAA,EAAM;IACNC,KAAA,EAAO;IACPC,eAAA,EAAiB;EACnB;AACF;AAEA,SAASC,gBACPV,UAAA,EACAW,aAAA,EACa;EACb,MAAMC,GAAA,GAAmB,CAAC;EAC1B,WAAWR,IAAA,IAAQJ,UAAA,EAAY;IAC7BY,GAAA,CAAI,GAAGR,IAAI,MAAM,IAAI;MAAES,OAAA,EAAS;QAAEC,YAAA,EAAcH,aAAA,CAAcP,IAAI;MAAE;IAAE;EACxE;EACA,OAAOQ,GAAA;AACT;AAEApB,QAAA,CAAS,yBAAyB,MAAM;EACtCE,EAAA,CAAG,gDAAgD,MAAM;IACvD,WAAWqB,CAAA,IAAK,CACd,SACA,oBACA,mBACA,aACA,aACA,kBACA,4BACF,EAAY;MACVtB,MAAA,CAAOI,qBAAA,CAAsB;QAAEiB,YAAA,EAAcC;MAAE,CAAC,CAAC,EAAEC,IAAA,CAAK,IAAI;IAC9D;EACF,CAAC;EAEDtB,EAAA,CAAG,wCAAwC,MAAM;IAC/CD,MAAA,CAAOI,qBAAA,CAAsB;MAAEiB,YAAA,EAAc;IAAO,CAAC,CAAC,EAAEE,IAAA,CAAK,KAAK;IAClEvB,MAAA,CAAOI,qBAAA,CAAsB,CAAC,CAAC,CAAC,EAAEmB,IAAA,CAAK,KAAK;IAC5CvB,MAAA,CAAOI,qBAAA,CAAsB,MAAS,CAAC,EAAEmB,IAAA,CAAK,KAAK;IACnDvB,MAAA,CAAOI,qBAAA,CAAsB,IAAI,CAAC,EAAEmB,IAAA,CAAK,KAAK;EAChD,CAAC;AACH,CAAC;AAEDxB,QAAA,CAAS,wBAAwB,MAAM;EACrCE,EAAA,CAAG,mCAAmC,MAAM;IAC1CD,MAAA,CAAOK,oBAAA,CAAqB;MAAEgB,YAAA,EAAc;IAAmB,CAAC,CAAC,EAAEE,IAAA,CAAK,IAAI;IAC5EvB,MAAA,CAAOK,oBAAA,CAAqB;MAAEgB,YAAA,EAAc;IAA4B,CAAC,CAAC,EAAEE,IAAA,CAAK,IAAI;IACrFvB,MAAA,CAAOK,oBAAA,CAAqB;MAAEgB,YAAA,EAAc;IAAQ,CAAC,CAAC,EAAEE,IAAA,CAAK,KAAK;IAClEvB,MAAA,CAAOK,oBAAA,CAAqB;MAAEgB,YAAA,EAAc;IAAY,CAAC,CAAC,EAAEE,IAAA,CAAK,KAAK;EACxE,CAAC;AACH,CAAC;AAEDxB,QAAA,CAAS,sCAAsC,MAAM;EACnDE,EAAA,CAAG,gDAAgD,MAAM;IACvD,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,QAAQ,UAAU,QAAQ,GAAG,CAAC;IACvD,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,QAAQ,UAAU,QAAQ,GAAG;MAChES,IAAA,EAAM;MACNC,MAAA,EAAQ;MACRC,MAAA,EAAQ;IACV,CAAC;IACD,MAAMT,GAAA,GAAMjB,kCAAA,CAAmCsB,KAAA,EAAOC,WAAW;IACjEzB,MAAA,CAAOmB,GAAA,CAAIV,MAAA,CAAOC,GAAA,CAAKmB,CAAA,IAAMA,CAAA,CAAElB,IAAI,CAAC,EAAEmB,OAAA,CAAQ,CAAC,QAAQ,QAAQ,CAAC;EAClE,CAAC;EAED7B,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,QAAQ,UAAU,QAAQ,GAAG,CAAC;IACvD,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,QAAQ,UAAU,QAAQ,GAAG;MAChES,IAAA,EAAM;MACNC,MAAA,EAAQ;MACRC,MAAA,EAAQ;IACV,CAAC;IACD,MAAMT,GAAA,GAAMjB,kCAAA,CAAmCsB,KAAA,EAAOC,WAAW;IACjEzB,MAAA,CAAOmB,GAAA,CAAIX,KAAK,EAAEe,IAAA,CAAK,CAAC;IACxBvB,MAAA,CAAOmB,GAAA,CAAIV,MAAA,CAAOU,GAAA,CAAIX,KAAK,EAAGG,IAAI,EAAEY,IAAA,CAAK,QAAQ;EACnD,CAAC;EAEDtB,EAAA,CAAG,8DAA8D,MAAM;IACrE,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,QAAQ,UAAU,QAAQ,GAAG,CAAC;IACvD,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,QAAQ,UAAU,QAAQ,GAAG;MAChES,IAAA,EAAM;MACNC,MAAA,EAAQ;MACRC,MAAA,EAAQ;IACV,CAAC;IACD,MAAMT,GAAA,GAAMjB,kCAAA,CAAmCsB,KAAA,EAAOC,WAAW;IACjEzB,MAAA,CAAOmB,GAAA,CAAIV,MAAA,CAAOU,GAAA,CAAIX,KAAK,EAAGG,IAAI,EAAEY,IAAA,CAAK,QAAQ;EACnD,CAAC;EAEDtB,EAAA,CAAG,+FAA+F,MAAM;IAItG,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,QAAQ,SAAS,QAAQ,GAAG,CAAC;IACtD,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,QAAQ,SAAS,QAAQ,GAAG;MAC/DS,IAAA,EAAM;MACNK,KAAA,EAAO;MACPJ,MAAA,EAAQ;IACV,CAAC;IACD,MAAMR,GAAA,GAAMjB,kCAAA,CAAmCsB,KAAA,EAAOC,WAAW;IACjEzB,MAAA,CAAOmB,GAAA,CAAIV,MAAA,CAAOC,GAAA,CAAKmB,CAAA,IAAMA,CAAA,CAAElB,IAAI,CAAC,EAAEmB,OAAA,CAAQ,CAAC,QAAQ,SAAS,QAAQ,CAAC;IACzE9B,MAAA,CAAOmB,GAAA,CAAIX,KAAK,EAAEe,IAAA,CAAK,CAAC;EAC1B,CAAC;EAEDtB,EAAA,CAAG,8CAA8C,MAAM;IACrD,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,YAAY,GAAG,CAAC;IACzC,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,YAAY,GAAG;MAAE,cAAc;IAAY,CAAC;IACjF,MAAME,GAAA,GAAMjB,kCAAA,CAAmCsB,KAAA,EAAOC,WAAW;IACjEzB,MAAA,CAAOmB,GAAA,CAAIV,MAAM,EAAEuB,YAAA,CAAa,CAAC;IACjChC,MAAA,CAAOmB,GAAA,CAAIX,KAAK,EAAEe,IAAA,CAAK,CAAC;EAC1B,CAAC;AACH,CAAC;AAEDxB,QAAA,CAAS,2BAA2B,MAAM;EACxCE,EAAA,CAAG,oDAAoD,MAAM;IAC3D,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,QAAQ,UAAU,UAAU,KAAK,GAAG,CAAC;IAC9D,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,QAAQ,UAAU,UAAU,KAAK,GAAG;MACvES,IAAA,EAAM;MACNC,MAAA,EAAQ;MACRC,MAAA,EAAQ;MACRK,GAAA,EAAK;IACP,CAAC;IACDjC,MAAA,CAAOG,uBAAA,CAAwBqB,KAAA,EAAOC,WAAW,CAAC,EAAEF,IAAA,CAAK,CAAC;EAC5D,CAAC;EAEDtB,EAAA,CAAG,6CAA6C,MAAM;IACpD,MAAMuB,KAAA,GAAQlB,SAAA,CAAU,CAAC,OAAO,GAAG,CAAC;IACpC,MAAMmB,WAAA,GAAcR,eAAA,CAAgB,CAAC,OAAO,GAAG;MAAEc,KAAA,EAAO;IAAY,CAAC;IACrE/B,MAAA,CAAOG,uBAAA,CAAwBqB,KAAA,EAAOC,WAAW,CAAC,EAAEF,IAAA,CAAK,EAAE;EAC7D,CAAC;AACH,CAAC","ignoreList":[]}