@12ui/design 0.2.57 → 0.2.59

package/dist/redesign-branch-stage.js

@@ -0,0 +1,218 @@
+import { stat } from 'node:fs/promises';
+import { TwelveUiBranchClient } from './branch-client.js';
+import { createConcurrencyLimiter } from './bounded-concurrency.js';
+import { executeBranchRun } from './branch-execution.js';
+import { branchAttemptPath, readBranchAttempt } from './branch-run-record.js';
+import { imageWinner } from './branch-winner.js';
+import { CliRefusal } from './cli-refusal.js';
+import { prepareOutputDirectory } from './cli-output-paths.js';
+import { BRANCH_PAGE_CONCURRENCY_DEFAULT } from './cli-progress.js';
+import { readConceptValue } from './concept-input.js';
+import { TwelveUiConversionPackageClient } from './package-client.js';
+import { TwelveUiPrototypeLabelClient } from './prototype-label-client.js';
+import { runPrototypePoststep } from './prototype-poststep.js';
+import { InvalidRedesignBranchArtifactError, } from './redesign-branch-adoption.js';
+import { redesignBranchIdempotencyKey, redesignBranchPageDirectory, } from './redesign-branch-identity.js';
+import { InvalidRedesignBranchAttemptError, InvalidRedesignBranchRecordError, verifyResumableRedesignBranchAttempt, verifyRedesignBranchPages, } from './redesign-branch-record-verification.js';
+import { InvalidRedesignPageOwnershipError } from './redesign-page-ownership.js';
+import { writeRedesignRecord, } from './redesign-workspace.js';
+const branchConcept = (direction, page) => readConceptValue({
+    value: `${direction} Rebuild the page at ${page.url}.`,
+    flag: '--direction',
+    trimHint: 'Shorten the direction; each page URL is appended automatically.',
+});
+const branchRefusal = (error) => {
+    if (error instanceof InvalidRedesignPageOwnershipError) {
+        throw new CliRefusal(`${error.message} Refusing branch dispatch.`, 'redesign_page_ownership_invalid', { cause: error });
+    }
+    if (error instanceof InvalidRedesignBranchArtifactError
+        || error instanceof InvalidRedesignBranchRecordError
+        || error instanceof InvalidRedesignBranchAttemptError) {
+        throw new CliRefusal(`${error.message} Refusing branch dispatch.`, 'redesign_branch_artifact_invalid', { cause: error });
+    }
+    throw error;
+};
+const recordAdoptedPages = async (args) => {
+    const added = new Map(args.entries
+        .filter((entry) => !entry.recorded && entry.adopted)
+        .map((entry) => [entry.input.page.id, entry.adopted.page]));
+    if (added.size === 0)
+        return args.record;
+    const existing = new Map((args.record.branch?.pages ?? []).map((page) => [page.pageId, page]));
+    for (const [pageId, page] of added)
+        existing.set(pageId, page);
+    const pages = args.record.capture.pages.flatMap((page) => {
+        const settled = existing.get(page.id);
+        return settled ? [settled] : [];
+    });
+    const record = { ...args.record, branch: { pages } };
+    await writeRedesignRecord(args.paths.record, record);
+    return record;
+};
+/** Execute or adopt one exact child per captured page, never a shared winner. */
+export const runRedesignBranchStage = async (args) => {
+    if (!args.record.capture)
+        throw new Error('Cannot branch before capture has run');
+    if (!args.record.pick)
+        throw new Error('Cannot branch before pick has run');
+    const capture = args.record.capture;
+    let preflight;
+    try {
+        preflight = await verifyRedesignBranchPages({
+            record: args.record,
+            pages: capture.pages,
+            branchDirectory: (page) => redesignBranchPageDirectory({
+                paths: args.paths,
+                record: args.record,
+                pageId: page.id,
+            }),
+            branchConcept: (page) => branchConcept(args.direction, page),
+        });
+    }
+    catch (error) {
+        return branchRefusal(error);
+    }
+    // A completed child failed under native branch semantics. Persist a newly
+    // found child for truthful resume/spend evidence, then stop before either a
+    // sibling dispatch or polish can hide that failure.
+    const adoptedFailure = preflight.find((entry) => entry.adopted?.failure)?.adopted?.failure;
+    if (adoptedFailure) {
+        await recordAdoptedPages({ record: args.record, paths: args.paths, entries: preflight });
+        throw adoptedFailure;
+    }
+    const remaining = preflight.filter((entry) => !entry.recorded);
+    if (remaining.length === 0)
+        return args.record;
+    // Prove every resume target before the first sibling can dispatch. A
+    // redesign key is intentionally page/generation-scoped, so an old attempt
+    // with that key can still name a different picked candidate.
+    const prepared = await Promise.all(remaining.map(async (entry) => {
+        const branchDir = redesignBranchPageDirectory({
+            paths: args.paths,
+            record: args.record,
+            pageId: entry.input.page.id,
+        });
+        const winner = await imageWinner(entry.input.winner.path, `The picked candidate for ${entry.input.page.id}`);
+        if (winner.kind !== 'image'
+            || winner.sha256 !== entry.input.winner.sha256
+            || winner.bytes.byteLength !== entry.input.winner.bytes) {
+            throw new CliRefusal(`The picked candidate for ${entry.input.page.id} no longer matches its durable materialized digest.`, 'redesign_page_pick_changed');
+        }
+        const runKey = redesignBranchIdempotencyKey({
+            createdAt: args.record.createdAt,
+            ...(args.record.redrawGeneration ? { redrawGeneration: args.record.redrawGeneration } : {}),
+            pageId: entry.input.page.id,
+        });
+        const attemptPath = branchAttemptPath(branchDir);
+        const attempt = await readBranchAttempt(attemptPath);
+        if (!attempt && !entry.adopted) {
+            const exists = await stat(attemptPath)
+                .then(() => true)
+                .catch((error) => {
+                if (error.code === 'ENOENT')
+                    return false;
+                throw error;
+            });
+            if (exists) {
+                return branchRefusal(new InvalidRedesignBranchAttemptError(branchDir, 'branch.attempt.json is not a readable native attempt record'));
+            }
+        }
+        if (attempt && !entry.adopted) {
+            try {
+                verifyResumableRedesignBranchAttempt({
+                    attempt,
+                    attemptPath,
+                    branchDir,
+                    input: entry.input,
+                    winner,
+                    runKey,
+                    concept: branchConcept(args.direction, entry.input.page),
+                    origin: args.config.origin,
+                    maxScreens: args.maxScreens,
+                    conversionModel: args.conversionModel,
+                });
+            }
+            catch (error) {
+                return branchRefusal(error);
+            }
+        }
+        return { entry, branchDir, winner, attempt };
+    }));
+    const branchClient = (args.dependencies.createBranchClient
+        ?? args.dependencies.createHostedClient
+        ?? ((value) => new TwelveUiBranchClient(value)))(args.config);
+    const packageClient = (args.dependencies.createPackageClient
+        ?? ((value) => new TwelveUiConversionPackageClient(value)))(args.config);
+    const limiter = createConcurrencyLimiter(BRANCH_PAGE_CONCURRENCY_DEFAULT);
+    const completed = await Promise.all(prepared.map(({ entry, branchDir, winner, attempt }) => limiter(async () => {
+        const labelClient = (args.dependencies.createPrototypeLabelClient
+            ?? ((value) => new TwelveUiPrototypeLabelClient(value)))(args.config);
+        if (entry.adopted) {
+            await (args.dependencies.runPrototype ?? runPrototypePoststep)({
+                branchDir,
+                resume: true,
+                labelClient,
+            });
+            return { page: entry.adopted.page, failure: entry.adopted.failure };
+        }
+        await prepareOutputDirectory(branchDir);
+        const result = await (args.dependencies.executeBranch ?? executeBranchRun)({
+            branchClient,
+            packageClient,
+            inputs: {
+                outDir: branchDir,
+                scope: 'page',
+                concept: branchConcept(args.direction, entry.input.page),
+                idempotencyKey: redesignBranchIdempotencyKey({
+                    createdAt: args.record.createdAt,
+                    ...(args.record.redrawGeneration ? { redrawGeneration: args.record.redrawGeneration } : {}),
+                    pageId: entry.input.page.id,
+                }),
+                winner,
+                maxScreens: args.maxScreens,
+                convert: { output: 'html', model: args.conversionModel },
+            },
+            origin: args.config.origin,
+            resume: Boolean(attempt),
+            // The outer limiter owns redesign page fan-out. Each child has one page.
+            pageConcurrency: 1,
+        });
+        await (args.dependencies.runPrototype ?? runPrototypePoststep)({ branchDir, labelClient });
+        return {
+            page: {
+                pageId: entry.input.page.id,
+                branchDir,
+                runId: result.completion.runId,
+                status: result.completion.status,
+                completionPath: result.completionPath,
+            },
+            failure: result.failure,
+        };
+    })));
+    // Child work is parallel; redesign.json remains one capture-order writer.
+    const settled = new Map((args.record.branch?.pages ?? []).map((page) => [page.pageId, page]));
+    const completedByPageId = new Map(completed.map((entry) => [entry.page.pageId, entry]));
+    let record = args.record;
+    let failure = null;
+    for (const page of capture.pages) {
+        const completedPage = completedByPageId.get(page.id);
+        if (!completedPage)
+            continue;
+        settled.set(page.id, completedPage.page);
+        record = {
+            ...record,
+            branch: {
+                pages: capture.pages.flatMap((capturedPage) => {
+                    const child = settled.get(capturedPage.id);
+                    return child ? [child] : [];
+                }),
+            },
+        };
+        await writeRedesignRecord(args.paths.record, record);
+        failure ??= completedPage.failure;
+    }
+    if (failure)
+        throw failure;
+    return record;
+};
+//# sourceMappingURL=redesign-branch-stage.js.map

package/dist/redesign-branch-stage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redesign-branch-stage.js","sourceRoot":"","sources":["../src/redesign-branch-stage.ts"],"names":[],"mappings":"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"}

package/dist/redesign-capture.d.ts

@@ -2,11 +2,13 @@ import type { RedesignCapturedPageRecord } from './redesign-workspace.js';
 /**
  * Stage 1: full-height screenshots of a target site's key pages.
  *
- * Discovery reads one page's HTML over `fetch` and keeps same-origin links
- * found in `nav`/`header`/`footer` (where a site states its own key pages),
- * falling back to the whole document when none of those hold a link. It never
- * launches a browser: link discovery is free and must stay that way so
- * `--dry-run` can report a page count without paying for a screenshot.
+ * A real capture discovers rendered links inside its own browser context,
+ * after any `--bootstrap` flow has seated authentication. It ranks those links
+ * with the shared improve ranker (`layerdoc/improve-core/improve-discovery.ts`)
+ * so the CLI and hosted capture service agree on a site's page inventory.
+ * The fetch-only helper below remains for dry-run/reporting callers that do
+ * not need a browser session; it cannot see routes that anonymous HTML does
+ * not link.
  *
  * Screenshotting is the one real Playwright dependency in this package (every
  * other stage buys through the hosted API). `capturePage` is injected so
@@ -15,21 +17,45 @@ import type { RedesignCapturedPageRecord } from './redesign-workspace.js';
  * reached in production.
  */
 export declare const REDESIGN_DEFAULT_MAX_PAGES = 5;
+/** Stable filesystem-safe slug for a discovered URL. */
+export declare const pageId: (url: string, index: number) => string;
+/**
+ * The root as fetched. `url` is the address the request finally landed on:
+ * `https://hubspot.com/` answers with `https://www.hubspot.com/`, whose every
+ * link is off-origin against the requested apex — discovery used to keep the
+ * requested URL and drop all 238 of them, finding one page where the capture
+ * service (which navigates and keeps `page.url()`) finds five. A caller that
+ * states only HTML states no redirect.
+ */
+export type RedesignRootDocument = {
+    url?: string;
+    html: string;
+};
+export type RedesignRootFetch = (url: string) => Promise<string | RedesignRootDocument>;
 /**
  * Same-origin URLs a caller would call this site's key pages: the homepage
- * first, then links found in navigational chrome, deduplicated by pathname
- * and capped at `maxPages`.
+ * first, then every other same-origin link the root states, ranked by the
+ * shared improve ranker (landmark chrome, then the page's bands, account
+ * plumbing last), deduplicated by pathname and capped at `maxPages`.
+ *
+ * A fetched document declares landmark membership but nothing laid it out, so
+ * `collectLinksFromDocument` states no position — the ranker then keeps
+ * document order inside the body tier rather than inventing geometry. Where a
+ * site hides links behind CSS the fetched document cannot resolve (a mega-menu
+ * that is `display:none` until hover), the rendered service ranks those below
+ * their visible siblings and this list cannot; the site's own origin, after
+ * redirects, is the root everything is resolved against.
  */
 export declare const discoverRedesignPageUrls: (args: {
     url: string;
     maxPages?: number;
-    fetchHtml?: (url: string) => Promise<string>;
+    fetchHtml?: RedesignRootFetch;
 }) => Promise<string[]>;
 export type RedesignCapturePageResult = {
     width: number;
     height: number;
 };
-export type RedesignCaptureDependencies = {
+export type RedesignCaptureDependencies = ImproveCaptureDependencies & {
     /**
      * Injectable browser boundary. Test callers can return a frozen inventory
      * directly, so capture-stage record plumbing has no browser dependency.
@@ -68,24 +94,128 @@ export declare const IMPROVE_BOOTSTRAP_FORM: string;
  * classified rather than assumed.
  */
 export declare const parseImproveBootstrap: (value: string) => ImproveBootstrapAction;
-/**
- * Improve reuses redesign's local Playwright provisioning, but keeps capture,
- * bootstrap seating, and selector extraction in one browser context. Nothing
- * in this boundary calls a hosted 12ui surface.
- */
-export declare const captureImprovePage: (args: {
+type ImproveCapturePage = {
+    goto: (url: string, options: {
+        waitUntil: 'networkidle';
+    }) => Promise<unknown>;
+    /** Where the browser actually IS, which is not always where it was sent (F27). */
+    url: () => string;
+    locator: (selector: string) => {
+        click: () => Promise<unknown>;
+    };
+    waitForURL: (url: string, options: {
+        waitUntil: 'networkidle';
+    }) => Promise<unknown>;
+    screenshot: (options: {
+        path: string;
+        fullPage: boolean;
+    }) => Promise<unknown>;
+    evaluate: <T>(pageFunction: (...args: never[]) => T, arg?: {
+        fullPage: boolean;
+    }) => Promise<T>;
+};
+type ImproveCaptureContext = {
+    newPage: () => Promise<ImproveCapturePage>;
+};
+type ImproveCaptureBrowser = {
+    newContext: (options: {
+        viewport: {
+            width: number;
+            height: number;
+        };
+    }) => Promise<ImproveCaptureContext>;
+    close: () => Promise<void>;
+};
+/** A bootstrap changed page state, but its requested route never appeared. */
+export declare class ImproveBootstrapWaitUrlMismatch extends Error {
+    readonly waitUrl: string;
+    readonly capturedUrl: string;
+    constructor(args: {
+        waitUrl: string;
+        capturedUrl: string;
+    });
+}
+/** Injectable only so browser/session ownership is deterministic in focused tests. */
+export type ImproveCaptureDependencies = {
+    launch?: () => Promise<ImproveCaptureBrowser>;
+};
+export type ImproveCaptureTarget = {
     url: string;
     screenshotFile: string;
     domDocFile: string;
+};
+export type ImproveCapturedPage = ImproveCaptureTarget & {
+    width: number;
+    height: number;
+    /** Where the browser landed for this page, which may not be `url` (F27). */
+    capturedUrl?: string;
+};
+type ImproveCaptureSettings = {
     viewport: {
         width: number;
         height: number;
     };
     fullPage: boolean;
+};
+export type RedesignRenderedDiscovery = {
+    count: number;
+    cap: number;
+    /** The page whose rendered links were inspected, after bootstrap seating. */
+    rootUrl: string;
+    context: 'public' | 'authenticated';
+};
+/**
+ * Discovers and captures a redesign in one browser context. This is deliberately
+ * the same session boundary as improve: an auth/bootstrap flow may land on an
+ * app shell whose routes do not exist in the anonymous HTML fetched from the
+ * public root. The `maxPages` limit caps the real discovered list; it never
+ * invents placeholder URLs to meet the requested count.
+ */
+export declare const captureRedesignSite: (args: {
+    url: string;
+    outDir: string;
+    maxPages: number;
+    bootstrap: readonly ImproveBootstrapAction[];
+    dependencies?: RedesignCaptureDependencies;
+}) => Promise<{
+    pages: RedesignCapturedPageRecord[];
+    discovery: RedesignRenderedDiscovery;
+}>;
+/**
+ * Improve reuses redesign's local Playwright provisioning, but keeps capture,
+ * bootstrap seating, and selector extraction in one browser context. Nothing
+ * in this boundary calls a hosted 12ui surface.
+ *
+ * This single-page entrypoint deliberately keeps its legacy navigation order:
+ * load the requested URL, apply bootstrap, then capture the page where that
+ * bootstrap left the session.
+ */
+export declare const captureImprovePage: (args: ImproveCaptureTarget & ImproveCaptureSettings & {
     bootstrap: readonly ImproveBootstrapAction[];
+    dependencies?: ImproveCaptureDependencies;
 }) => Promise<{
     width: number;
     height: number;
     url?: string;
 }>;
+/**
+ * Captures a root screen and its sibling pages through one browser and one
+ * context. Bootstrap establishes authenticated/session state once; each URL
+ * is then revisited in that same state before its screenshot and DOM document
+ * are collected, in the supplied order.
+ */
+export declare const captureImproveSite: (args: ImproveCaptureSettings & {
+    pages: readonly ImproveCaptureTarget[];
+    bootstrap: readonly ImproveBootstrapAction[];
+    /**
+     * Normal site capture discovers from the root that this very context already
+     * rendered. The CLI's free dry-run deliberately omits this field and keeps
+     * its fetch-only inventory.
+     */
+    discover?: {
+        maxPages: number;
+    };
+    dependencies?: ImproveCaptureDependencies;
+}) => Promise<ImproveCapturedPage[]>;
+export {};
 //# sourceMappingURL=redesign-capture.d.ts.map

package/dist/redesign-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redesign-capture.d.ts","sourceRoot":"","sources":["../src/redesign-capture.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1E;;;;;;;;;;;;;;GAcG;AAEH,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAyB5C;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAU,MAAM;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C,KAAG,OAAO,CAAC,MAAM,EAAE,CA6BnB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,KAAK,OAAO,CAAC,yBAAyB,CAAC,CAAC;CAC1C,CAAC;AAuBF,8EAA8E;AAC9E,eAAO,MAAM,oBAAoB,GAAU,MAAM;IAC/C,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,2BAA2B,CAAC;CAC5C,KAAG,OAAO,CAAC,0BAA0B,EAAE,CA4BvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,MAAM,GAAG,SAOhD,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAQQ,CAAC;AAE5C;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,sBAuBrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAU,MAAM;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,SAAS,sBAAsB,EAAE,CAAC;CAC9C,KAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAiC1D,CAAC"}
+{"version":3,"file":"redesign-capture.d.ts","sourceRoot":"","sources":["../src/redesign-capture.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1E;;;;;;;;;;;;;;;;GAgBG;AAEH,eAAO,MAAM,0BAA0B,IAAsC,CAAC;AAG9E,wDAAwD;AACxD,eAAO,MAAM,MAAM,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,MAanD,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAAC;AAQxF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,wBAAwB,GAAU,MAAM;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC/B,KAAG,OAAO,CAAC,MAAM,EAAE,CAOnB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,0BAA0B,GAAG;IACrE;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,KAAK,OAAO,CAAC,yBAAyB,CAAC,CAAC;CAC1C,CAAC;AAuBF,8EAA8E;AAC9E,eAAO,MAAM,oBAAoB,GAAU,MAAM;IAC/C,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,2BAA2B,CAAC;CAC5C,KAAG,OAAO,CAAC,0BAA0B,EAAE,CA4BvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,MAAM,GAAG,SAOhD,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAQQ,CAAC;AAE5C;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,sBAuBrD,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,SAAS,EAAE,aAAa,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,kFAAkF;IAClF,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,KAAK,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;IACjE,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,SAAS,EAAE,aAAa,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrF,UAAU,EAAE,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,QAAQ,EAAE,CAAC,CAAC,EACV,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EACrC,GAAG,CAAC,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,KACxB,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAC5C,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACzG,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,8EAA8E;AAC9E,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;CAM3D;AAED,sFAAsF;AACtF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG;IACvD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA6BF,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,6EAA6E;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,QAAQ,GAAG,eAAe,CAAC;CACrC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,2BAA2B,CAAC;CAC5C,KAAG,OAAO,CAAC;IAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;IAAC,SAAS,EAAE,yBAAyB,CAAA;CAAE,CAuCxF,CAAC;AAkCF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAU,MAAM,oBAAoB,GAAG,sBAAsB,GAAG;IAC7F,SAAS,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,0BAA0B,CAAC;CAC3C,KAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAc1D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAU,MAAM,sBAAsB,GAAG;IACtE,KAAK,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACvC,SAAS,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC7C;;;;OAIG;IACH,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,YAAY,CAAC,EAAE,0BAA0B,CAAC;CAC3C,KAAG,OAAO,CAAC,mBAAmB,EAAE,CA+BhC,CAAC"}