@madojs/mado 0.11.1 → 0.13.0

package/starters/{default → modular}/src/layouts/app-shell.layout.ts

@@ -9,27 +9,29 @@
 //
 // Layouts live in src/layouts/ because they describe APP ZONES, not domains.
 
-import { html, page } from "@madojs/mado";
+import { html, page, routeUrl } from "@madojs/mado";
 
 import { isAuthed, logout, user } from "../modules/auth/auth.public";
-import "../shared/ui/x-button.component";
 
 export default page({
   title: "Mado App",
+  // Every internal anchor uses `data-link` + `routeUrl()` so SPA
+  // navigation intercepts the click and the href stays correct under
+  // any Vite `base` (e.g. deploying the app under `/admin/`).
   view: ({ child }) => html`
     <div class="layout layout--app">
       <header class="app-header">
-        <a href="/" class="brand">Mado App</a>
+        <a data-link href=${routeUrl("/")} class="brand">Mado App</a>
         <nav>
-          <a href="/billing/invoices">Invoices</a>
+          <a data-link href=${routeUrl("/billing/invoices")}>Invoices</a>
           ${() =>
             isAuthed()
               ? html`<span class="who">${() => user()?.email ?? ""}</span>
-                  <x-button variant="ghost" @click=${logout}>Sign out</x-button>`
-              : html`<a href="/login">Sign in</a>`}
+                  <button class="button button--ghost" type="button" @click=${logout}>Sign out</button>`
+              : html`<a data-link href=${routeUrl("/login")}>Sign in</a>`}
         </nav>
       </header>
       <main class="app-main">${child}</main>
     </div>
   `,
-});
+});

package/starters/{default → modular}/src/layouts/auth-shell.layout.ts

@@ -4,14 +4,14 @@
 // auth ZONE. If tomorrow a `password-reset` module appears, it will reuse
 // this same shell.
 
-import { html, page } from "@madojs/mado";
+import { html, page, routeUrl } from "@madojs/mado";
 
 export default page({
   title: "Sign in",
   view: ({ child }) => html`
     <div class="layout layout--auth">
-      <a href="/" class="brand">Mado App</a>
+      <a data-link href=${routeUrl("/")} class="brand">Mado App</a>
       <main class="auth-main">${child}</main>
     </div>
   `,
-});
+});

package/starters/modular/src/main.ts

@@ -0,0 +1,16 @@
+// App entry point. The ONLY file allowed to import CSS at runtime.
+import "./shared/styles/tokens.css";
+import "./shared/styles/reset.css";
+import "./shared/styles/shell.css";
+import "./shared/styles/content.css";
+
+import { html, render } from "@madojs/mado";
+
+import { init as initAuth } from "./modules/auth/auth.service";
+import appRoutes from "./app.routes";
+
+// One-off boot order: init cross-cutting modules first, then render the
+// router view into #app.
+await initAuth();
+
+render(html`${appRoutes.view}`, document.getElementById("app")!);

package/starters/{default → modular}/src/modules/auth/login.page.ts

@@ -1,7 +1,5 @@
 import { html, navigate, page, signal, useForm } from "@madojs/mado";
 
-import "../../shared/ui/x-button.component";
-
 import { login } from "./auth.service";
 
 // 1. LOCAL STATE
@@ -16,15 +14,12 @@ import { login } from "./auth.service";
 export default page({
   title: "Sign in",
   view: () => {
-    const submitting = signal(false);
     const error = signal<string | null>(null);
     const form = useForm({
-      email: { required: true, type: "email" },
-      password: { required: true, minLength: 6 },
+      initial: { email: "", password: "" },
     });
 
     const onSubmit = form.onSubmit(async (values) => {
-      submitting.set(true);
       error.set(null);
       try {
         await login({
@@ -34,8 +29,6 @@ export default page({
         navigate("/");
       } catch (err) {
         error.set(err instanceof Error ? err.message : "Login failed");
-      } finally {
-        submitting.set(false);
       }
     });
 
@@ -49,12 +42,12 @@ export default page({
           </label>
           <label>
             Password
-            <input name="password" type="password" required @input=${form.onInput} />
+            <input name="password" type="password" required minlength="6" @input=${form.onInput} />
           </label>
           ${() => (error() ? html`<p class="error">${error()}</p>` : null)}
-          <x-button ?disabled=${() => submitting() || !form.isValid()}>
-            ${() => (submitting() ? "Signing in…" : "Sign in")}
-          </x-button>
+          <button class="button" type="submit" ?disabled=${() => form.submitting() || !form.isValid()}>
+            ${() => (form.submitting() ? "Signing in…" : "Sign in")}
+          </button>
         </form>
       </section>
     `;

package/starters/{default → modular}/src/modules/billing/pages/invoice-detail.page.ts

@@ -1,8 +1,7 @@
 import { html, page, signal } from "@madojs/mado";
 
 import { formatDate, formatMoney } from "../../../shared/lib/format-date";
-import "../../../shared/ui/x-button.component";
-import "../../../shared/ui/x-spinner.component";
+import "@/shared/ui/x-spinner.component";
 
 import { hasPermission } from "../../auth/auth.public";
 
@@ -58,9 +57,9 @@ export default page({
                       <dt>Issued</dt><dd>${formatDate(i.issuedAt)}</dd>
                     </dl>
                     ${i.status === "pending" && hasPermission("billing.invoices.pay")
-                      ? html`<x-button ?disabled=${paying} @click=${onPay}>
+                      ? html`<button class="button" type="button" ?disabled=${paying} @click=${onPay}>
                           ${() => (paying() ? "Paying…" : "Pay now")}
-                        </x-button>`
+                        </button>`
                       : null}
                   `;
                 })()}

package/starters/{default → modular}/src/modules/billing/pages/invoices-list.page.ts

@@ -1,7 +1,7 @@
-import { each, html, page, signal, untracked } from "@madojs/mado";
+import { each, html, page, routeUrl, signal, untracked } from "@madojs/mado";
 
 import { formatDate, formatMoney } from "../../../shared/lib/format-date";
-import "../../../shared/ui/x-spinner.component";
+import "@/shared/ui/x-spinner.component";
 
 import "../components/invoice-status-badge.component";
 import { useInvoices } from "../data/invoices.resource";
@@ -50,7 +50,7 @@ export default page({
                           (i) => html`
                             <tr>
                               <td>
-                                <a href=${`/billing/invoices/${i.id}`}>${i.number}</a>
+                                <a data-link href=${routeUrl(`/billing/invoices/${i.id}`)}>${i.number}</a>
                               </td>
                               <td>${i.customerEmail}</td>
                               <td>${formatMoney(i.amount, i.currency)}</td>
@@ -59,7 +59,7 @@ export default page({
                               </td>
                               <td>${formatDate(i.issuedAt)}</td>
                               <td>
-                                <a href=${`/billing/invoices/${i.id}`}>Open</a>
+                                <a data-link href=${routeUrl(`/billing/invoices/${i.id}`)}>Open</a>
                               </td>
                             </tr>
                           `,

package/starters/{default → modular}/src/modules/home/home.page.ts

@@ -6,7 +6,7 @@
 //
 // A page should be read top-to-bottom and understood without jumping files.
 
-import { html, page } from "@madojs/mado";
+import { html, page, routeUrl } from "@madojs/mado";
 
 // 1. LOCAL STATE — none
 // 2. DATA       — none
@@ -14,20 +14,18 @@ import { html, page } from "@madojs/mado";
 
 // 4. VIEW
 export default page({
+  static: true,
   title: "Home",
   head: () => ({
     description: "A modular Mado application.",
   }),
-  bake: {
-    paths: () => [{}],
-    data: () => ({}),
-  },
   view: () => html`
     <section>
       <h1>Mado App</h1>
       <p>
-        Welcome. Try <a href="/billing/invoices">billing</a> or
-        <a href="/login">sign in</a>.
+        Welcome. Try
+        <a data-link href=${routeUrl("/billing/invoices")}>billing</a>
+        or <a data-link href=${routeUrl("/login")}>sign in</a>.
       </p>
     </section>
   `,

package/starters/modular/src/modules/home/not-found.page.ts

@@ -0,0 +1,14 @@
+import { html, page, routeUrl } from "@madojs/mado";
+
+export default page({
+  title: "Not Found",
+  view: () => html`
+    <section>
+      <h1>404</h1>
+      <p>
+        This route does not exist.
+        <a data-link href=${routeUrl("/")}>Go home</a>.
+      </p>
+    </section>
+  `,
+});

package/starters/{default → modular}/src/shared/styles/reset.css

@@ -29,4 +29,24 @@ a:hover {
 button {
   font-family: inherit;
   font-size: inherit;
-}
+}
+
+.button {
+  padding: var(--space-2) var(--space-4);
+  border: 1px solid transparent;
+  border-radius: var(--radius-md);
+  background: var(--color-primary);
+  color: var(--color-primary-contrast);
+  cursor: pointer;
+}
+
+.button--ghost {
+  border-color: var(--color-border);
+  background: transparent;
+  color: var(--color-text);
+}
+
+.button:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+}

package/starters/modular/src/styles.d.ts

@@ -0,0 +1 @@
+declare module "*.css";

package/starters/modular/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/starters/modular/tsconfig.json

@@ -0,0 +1,33 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ]
+    },
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "Bundler",
+    "lib": [
+      "ES2022",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "strict": true,
+    "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "useDefineForClassFields": true,
+    "experimentalDecorators": false,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts"],
+  "exclude": ["node_modules", "out"]
+}

package/starters/modular/tsconfig.node.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "types": ["node"],
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "skipLibCheck": true,
+    "noEmit": true
+  },
+  "include": ["vite.config.ts"]
+}

package/starters/modular/vite.config.ts

@@ -0,0 +1,132 @@
+import { defineConfig, type Plugin } from "vite";
+import { mado } from "@madojs/mado/vite";
+
+/**
+ * Tiny in-memory mock for the auth + billing API used by this starter.
+ *
+ * Mounted only in `dev` so `mado release` ships a clean bundle that
+ * talks to your real backend. The endpoint shape mirrors what
+ * `auth.connector.ts` and `stripe.connector.ts` expect: any change in
+ * one must be mirrored in the other.
+ *
+ * Disable by removing this plugin or setting `MADO_MOCK_API=0`.
+ */
+function devApiMock(): Plugin {
+  const users = new Map<string, { password: string; user: unknown }>([
+    [
+      "demo@mado.dev",
+      {
+        password: "demo123",
+        user: {
+          id: "u_demo",
+          email: "demo@mado.dev",
+          roles: ["user"],
+          permissions: ["billing.read", "billing.invoices.pay"],
+        },
+      },
+    ],
+  ]);
+  const invoices = Array.from({ length: 6 }, (_, i) => ({
+    id: `in_${1000 + i}`,
+    number: `INV-${1000 + i}`,
+    customer_email: "demo@mado.dev",
+    amount_due: 1000 * (i + 1),
+    currency: "usd",
+    status: i % 3 === 0 ? "paid" : i % 3 === 1 ? "pending" : "draft",
+    created: Math.floor(Date.now() / 1000) - i * 86_400,
+  }));
+  let token: string | null = null;
+  const json = (res: import("http").ServerResponse, status: number, body: unknown) => {
+    res.statusCode = status;
+    res.setHeader("content-type", "application/json");
+    res.end(JSON.stringify(body));
+  };
+  const readJson = (req: import("http").IncomingMessage) =>
+    new Promise<Record<string, unknown>>((resolve) => {
+      let buf = "";
+      req.on("data", (chunk) => (buf += chunk));
+      req.on("end", () => {
+        try {
+          resolve(buf ? JSON.parse(buf) : {});
+        } catch {
+          resolve({});
+        }
+      });
+    });
+
+  return {
+    name: "starter:dev-api-mock",
+    apply: "serve",
+    configureServer(server) {
+      if (process.env.MADO_MOCK_API === "0") return;
+      server.middlewares.use(async (req, res, next) => {
+        const url = req.url ?? "";
+        if (!url.startsWith("/api/")) return next();
+
+        // ---- auth -----------------------------------------------------
+        if (url === "/api/auth/login" && req.method === "POST") {
+          const body = await readJson(req);
+          const entry = users.get(String(body.email ?? ""));
+          if (!entry || entry.password !== body.password) {
+            return json(res, 401, { error: "invalid_credentials" });
+          }
+          token = `tok_${Math.random().toString(36).slice(2)}`;
+          return json(res, 200, { token, user: entry.user });
+        }
+        if (url === "/api/auth/me" && req.method === "GET") {
+          if (!token) return json(res, 401, { error: "unauthenticated" });
+          const entry = users.values().next().value;
+          if (!entry) return json(res, 500, { error: "mock_user_missing" });
+          return json(res, 200, entry.user);
+        }
+        if (url === "/api/auth/logout" && req.method === "POST") {
+          token = null;
+          return json(res, 204, null);
+        }
+
+        // ---- billing --------------------------------------------------
+        if (url.startsWith("/api/billing/stripe/invoices")) {
+          const id = url.match(/\/invoices\/([^/?]+)/)?.[1];
+          if (req.method === "POST" && url.endsWith("/pay") && id) {
+            const inv = invoices.find((x) => x.id === id);
+            if (!inv) return json(res, 404, { error: "not_found" });
+            inv.status = "paid";
+            return json(res, 200, inv);
+          }
+          if (id && req.method === "GET") {
+            const inv = invoices.find((x) => x.id === id);
+            return inv
+              ? json(res, 200, inv)
+              : json(res, 404, { error: "not_found" });
+          }
+          if (req.method === "GET") {
+            return json(res, 200, { data: invoices, has_more: false });
+          }
+        }
+
+        return next();
+      });
+    },
+  };
+}
+
+export default defineConfig({
+  resolve: {
+    tsconfigPaths: true,
+  },
+  plugins: [
+    devApiMock(),
+    mado({
+      // Public origin used to build absolute URLs for static snapshots
+      // (sitemap, canonical, OpenGraph). Combined with Vite's `base`,
+      // the canonical for a route is `site + base + pathname`.
+      //
+      // REQUIRED when any page declares `static`. Set to your deployment
+      // origin (e.g. https://your-app.example) before running
+      // `mado release`. Override per environment via:
+      //   mado release --base-url https://staging.example
+      //   MADO_SITE=https://staging.example mado release
+      // site: "https://your-app.example",
+    }),
+  ],
+});

package/TODO.md

@@ -1,79 +0,0 @@
-# TODO
-
-Backlog, not a roadmap. Keep this file small and honest: ideas stay here only
-while they are plausible next work. Promote concrete work to issues or release
-notes when it becomes real.
-
-## Before Public Demo / Release
-
-- [ ] Run the default starter as a real demo app and feed every friction point
-  back into docs, CLI generators, or starter structure.
-- [ ] Add focused tests for every `mado new` generator template.
-- [ ] Audit EN/RU/FR docs after each tooling/runtime change; no old `dist/`,
-  `tsc-only`, custom-bundler, or legacy example wording should remain.
-- [ ] Keep `mado preview` boring and reliable inside generated apps.
-- [ ] Add a short maintainer-only release checklist if manual npm publish stays
-  in use.
-
-## CLI / DX
-
-- [ ] Decide whether `npx mado create my-app` is worth adding after package
-  naming and install friction are clear.
-- [ ] Consider short aliases over `mado new` only after real usage shows they
-  save enough typing (`mado page`, `mado component`, etc.).
-- [ ] Split preview/static-server internals only if `scripts/preview.mjs` grows.
-- [ ] Typed navigation inferred from route patterns.
-- [ ] Editor highlighting docs should prefer existing tooling first; build a
-  Mado-specific VS Code extension only if current HTML/CSS template support is
-  not enough.
-
-## Runtime / App API
-
-- [ ] Mutation rollback helper on top of `resource().mutate()` and `mutation()`.
-- [ ] Document loading/error shell patterns before adding an `<x-async>` API.
-- [ ] `liveResource()` over SSE / WebSocket after a real app needs live data.
-- [ ] i18n helper once browser-native message formatting is realistic.
-- [ ] Accessibility helpers: focus trap, live region, click outside.
-
-## Styling
-
-- [ ] Docs for `::part`, `::slotted()` and `:host-context()`.
-- [ ] Document Vite CSS options, including `css.transformer: "lightningcss"`,
-  for apps that want Lightning CSS.
-- [ ] Optional tiny utilities stylesheet only if the starter/demo repeats the
-  same small classes often enough to justify it.
-- [ ] CSP-friendly style mode.
-
-## Bake / Smart Static
-
-- [ ] Add bake regression coverage for layout groups, dynamic params, sitemap,
-  and hard-refresh deploy paths.
-- [ ] Incremental bake cache after a real content-heavy app needs it.
-- [ ] Webhook re-bake endpoint only after incremental bake has a concrete use.
-- [ ] RSS / Atom feed generator for docs/blog/demo content.
-
-## Operations
-
-- [ ] Benchmark against Lit / Solid / Preact.
-- [ ] Source-map notes and a minimal dev error overlay.
-- [ ] `eslint-plugin-mado` rules only if docs/starter conventions are not enough
-  to prevent recurring mistakes.
-- [ ] Timeout / retry options for resource fetchers after real API friction.
-- [ ] Schema validation hook for resources after choosing a dependency-free
-  story or a clearly optional integration.
-- [ ] PWA scaffold only if the public demo or a real app needs offline behavior.
-
-## Community / GitHub
-
-- [ ] Minimal landing site built with Mado.
-- [ ] Public live demo: CRUD starter and showcase hosted from Mado itself.
-- [ ] Case study: real React page -> Mado + bake.
-- [ ] Convert contribution-ready TODO items into GitHub issues with labels
-  (`good first issue`, `help wanted`, `docs`, `cli`, `ci`) after the first
-  public feedback round.
-- [ ] Configure npm Trusted Publishing for GitHub Actions after verifying the
-  first manual publishes.
-- [ ] Decide the release flow: continue manual npm publish for patch releases or
-  publish from signed `v*` tags through `.github/workflows/release.yml`.
-- [ ] Improve generated release notes with PR links/authors when releases start
-  going through pull requests.

package/dist/src/lazy.d.ts

@@ -1,38 +0,0 @@
-/**
- * lazy() — deferred module loading with a reactive placeholder.
- *
- * Why: heavy components (charts, code editors, modals)
- * don't need to be loaded on startup. lazy() gives a TemplateResult function
- * that returns a fallback until loaded, then the real template.
- *
- *   const Chart = lazy(
- *     () => import('./components/chart.js'),
- *     { fallback: () => html`<x-spinner/>` },
- *   );
- *
- *   html`<div>${Chart({ data })}</div>`
- *
- * Module contract: must default-export a function
- *   (props) => TemplateResult.
- *
- * Loading is cached (one import() per loader reference).
- */
-import type { TemplateResult } from "./html/template-types.js";
-export interface LazyOptions<P> {
-    /** What to show while the module is loading. */
-    fallback?: (props: P) => TemplateResult;
-    /** What to show if the import failed. Default — empty string. */
-    error?: (err: Error, props: P) => TemplateResult;
-}
-type Renderer<P> = (props: P) => TemplateResult;
-/**
- * Create a lazy component.
- * Takes a dynamic import, returns a render function.
- *
- *   const Modal = lazy(() => import('./modal.js'));
- *   html`${open() ? Modal({ onClose }) : null}`
- */
-export declare function lazy<P = unknown>(loader: () => Promise<{
-    default: Renderer<P>;
-}>, options?: LazyOptions<P>): (props: P) => TemplateResult;
-export {};

package/dist/src/lazy.js

@@ -1,73 +0,0 @@
-/**
- * lazy() — deferred module loading with a reactive placeholder.
- *
- * Why: heavy components (charts, code editors, modals)
- * don't need to be loaded on startup. lazy() gives a TemplateResult function
- * that returns a fallback until loaded, then the real template.
- *
- *   const Chart = lazy(
- *     () => import('./components/chart.js'),
- *     { fallback: () => html`<x-spinner/>` },
- *   );
- *
- *   html`<div>${Chart({ data })}</div>`
- *
- * Module contract: must default-export a function
- *   (props) => TemplateResult.
- *
- * Loading is cached (one import() per loader reference).
- */
-import { signal } from "./signal.js";
-import { html } from "./html/template.js";
-const cache = new WeakMap();
-/**
- * Create a lazy component.
- * Takes a dynamic import, returns a render function.
- *
- *   const Modal = lazy(() => import('./modal.js'));
- *   html`${open() ? Modal({ onClose }) : null}`
- */
-export function lazy(loader, options = {}) {
-    return (props) => {
-        // One signal trigger per call instance; the html binder will resubscribe
-        // when the state changes.
-        const trig = signal(0);
-        const state = ensureLoaded(loader);
-        if (state.state === "loading") {
-            // subscribe: when state transitions to ready/error, trigger trig
-            const wait = waitFor(loader);
-            wait.then(() => trig.update((n) => n + 1), () => trig.update((n) => n + 1));
-        }
-        return html `${() => {
-            trig(); // subscription
-            const s = ensureLoaded(loader);
-            if (s.state === "ready" && s.renderer)
-                return s.renderer(props);
-            if (s.state === "error" && s.err) {
-                return options.error?.(s.err, props) ?? "";
-            }
-            return options.fallback?.(props) ?? "";
-        }}`;
-    };
-}
-function ensureLoaded(loader) {
-    const existing = cache.get(loader);
-    if (existing)
-        return existing;
-    const fresh = { state: "loading" };
-    cache.set(loader, fresh);
-    loader().then((mod) => {
-        fresh.state = "ready";
-        fresh.renderer = mod.default;
-    }, (err) => {
-        fresh.state = "error";
-        fresh.err = err instanceof Error ? err : new Error(String(err));
-    });
-    return fresh;
-}
-function waitFor(loader) {
-    // return the same Promise as ensureLoaded — otherwise we'd create a new one.
-    // The browser actually caches the same module, so the second call returns instantly.
-    return loader();
-}
-//# sourceMappingURL=lazy.js.map

package/dist/src/lazy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lazy.js","sourceRoot":"","sources":["../../src/lazy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAkB1C,MAAM,KAAK,GAAG,IAAI,OAAO,EAA8B,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,UAAU,IAAI,CAClB,MAA+C,EAC/C,UAA0B,EAAE;IAE5B,OAAO,CAAC,KAAQ,EAAE,EAAE;QAClB,yEAAyE;QACzE,0BAA0B;QAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,YAAY,CAAI,MAAM,CAAC,CAAC;QAEtC,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC9B,iEAAiE;YACjE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,IAAI,CACP,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAC/B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAChC,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAA,GAAG,GAAG,EAAE;YACjB,IAAI,EAAE,CAAC,CAAC,eAAe;YACvB,MAAM,CAAC,GAAG,YAAY,CAAI,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ;gBAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAChE,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;gBACjC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7C,CAAC;YACD,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACzC,CAAC,EAAE,CAAC;IACN,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,MAA+C;IAE/C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,MAA2B,CAEzC,CAAC;IACd,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,KAAK,GAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACjD,KAAK,CAAC,GAAG,CAAC,MAA2B,EAAE,KAA2B,CAAC,CAAC;IACpE,MAAM,EAAE,CAAC,IAAI,CACX,CAAC,GAAG,EAAE,EAAE;QACN,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC;QACtB,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/B,CAAC,EACD,CAAC,GAAY,EAAE,EAAE;QACf,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC;QACtB,KAAK,CAAC,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC,CACF,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CACd,MAA+C;IAE/C,6EAA6E;IAC7E,qFAAqF;IACrF,OAAO,MAAM,EAAE,CAAC;AAClB,CAAC"}