@nativescript/vite 8.0.0-alpha.6 → 8.0.0-alpha.61

package/hmr/frameworks/solid/build/solid-jsx-deps.js

@@ -0,0 +1,178 @@
+import fs from 'fs';
+import path from 'path';
+/**
+ * Why this helper exists
+ * ----------------------
+ *
+ * Vite's depscanner happily pre-bundles every bare specifier the app
+ * imports. For a Solid library that publishes pre-compiled-but-still-JSX
+ * files (e.g. `solid-navigation`'s `dist/src/*.jsx`), the pre-bundle output
+ * lands at `node_modules/.vite/deps/<pkg>.js` with the JSX intact —
+ * rolldown's depscanner doesn't run Solid's JSX transform (that lives in
+ * `vite-plugin-solid`'s `transform` hook, which only matches files whose
+ * id ends in `.jsx`/`.tsx`).
+ *
+ * Vite then runs `vite:import-analysis` on the `.js` output, hits the
+ * first JSX expression, and aborts the dev server's pre-transform with:
+ *
+ *   Failed to parse source for import analysis because the content
+ *   contains invalid JS syntax. If you are using JSX, make sure to
+ *   name the file with the .jsx or .tsx extension.
+ *   File: /…/.vite/deps/<pkg>.js:51:32
+ *
+ * The fix: when a project depends on a Solid library that ships `.jsx`
+ * (or `.tsx`) source files in its package directory, mark that package
+ * as `optimizeDeps.exclude` so Vite serves it through the regular dev
+ * pipeline, where `vite-plugin-solid`'s `transform` hook matches the
+ * original `.jsx` id and applies the Solid babel preset.
+ *
+ * Detection rules — biased toward false negatives so we never wrongly
+ * exclude a package that Vite must pre-bundle (esp. CJS-only deps that
+ * need esm interop). A package is excluded only when ALL of the
+ * following hold:
+ *
+ *   1. It declares `solid-js` or `@nativescript-community/solid-js` in
+ *      `dependencies` / `peerDependencies` / `devDependencies`. This is
+ *      a strong signal that the package's published artifacts are
+ *      meant to be processed by a Solid-aware JSX transformer.
+ *   2. Its package directory contains at least one `.jsx` / `.tsx`
+ *      source file under `dist` / `lib` / `build` / `es` / `esm` /
+ *      `out` (the common published-output dirs) or directly at the
+ *      package root. We deliberately skip `node_modules`, `src` (raw
+ *      sources, not what `main` points to), and test dirs.
+ *
+ * Both checks are scoped to packages installed in the app's
+ * `node_modules` (plus the monorepo's hoisted `node_modules`, if any)
+ * — we never recurse into transitive nested copies, since those are
+ * also reachable from the same top-level scan once Vite resolves them.
+ */
+const PUBLISHED_OUTPUT_DIRS = new Set(['dist', 'lib', 'build', 'es', 'esm', 'out']);
+// Always-skip subdirs regardless of depth: nested copies, test fixtures,
+// docs, and example apps. Notably `src` is NOT in here because a published
+// bundle may use `dist/src/<file>.jsx` as its layout (e.g. `solid-navigation`).
+// `src/` at the *package root* is rejected separately by the
+// "depth 0 must be a published-output dir" gate below.
+const ALWAYS_SKIP_DIR_NAMES = new Set(['node_modules', 'test', 'tests', '__tests__', 'spec', 'specs', 'docs', 'examples', 'example', '.git', '.cache']);
+const JSX_EXT_RE = /\.(jsx|tsx)$/;
+const MAX_SCAN_DEPTH = 4;
+function isSolidConsumer(pkgJson) {
+    const buckets = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'];
+    for (const key of buckets) {
+        const deps = pkgJson[key];
+        if (!deps || typeof deps !== 'object')
+            continue;
+        if (deps['solid-js'])
+            return true;
+        if (deps['@nativescript-community/solid-js'])
+            return true;
+    }
+    return false;
+}
+function hasJsxFile(dir, depth = 0) {
+    if (depth > MAX_SCAN_DEPTH)
+        return false;
+    let entries;
+    try {
+        entries = fs.readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return false;
+    }
+    for (const entry of entries) {
+        if (entry.isFile() && JSX_EXT_RE.test(entry.name)) {
+            return true;
+        }
+        if (entry.isDirectory()) {
+            if (entry.name.startsWith('.'))
+                continue;
+            if (ALWAYS_SKIP_DIR_NAMES.has(entry.name))
+                continue;
+            // At depth 0 (package root) only descend into known
+            // published-output dirs so a sibling `src/` (raw sources)
+            // can't flag the package on its own. Deeper levels are
+            // inside a publish dir already, so any subdir (incl. `src`)
+            // is fair game.
+            if (depth === 0 && !PUBLISHED_OUTPUT_DIRS.has(entry.name))
+                continue;
+            if (hasJsxFile(path.join(dir, entry.name), depth + 1))
+                return true;
+        }
+    }
+    return false;
+}
+function scanDirectoryForJsxPackages(nodeModulesDir, result, scope = '') {
+    let entries;
+    try {
+        entries = fs.readdirSync(nodeModulesDir, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        if (entry.name.startsWith('.'))
+            continue;
+        if (entry.name === 'node_modules')
+            continue;
+        const entryPath = path.join(nodeModulesDir, entry.name);
+        if (!scope && entry.name.startsWith('@')) {
+            scanDirectoryForJsxPackages(entryPath, result, entry.name);
+            continue;
+        }
+        const pkgName = scope ? `${scope}/${entry.name}` : entry.name;
+        if (result.has(pkgName))
+            continue;
+        const pkgJsonPath = path.join(entryPath, 'package.json');
+        if (!fs.existsSync(pkgJsonPath))
+            continue;
+        let pkgJson;
+        try {
+            pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+        }
+        catch {
+            continue;
+        }
+        if (!isSolidConsumer(pkgJson))
+            continue;
+        if (!hasJsxFile(entryPath))
+            continue;
+        result.add(pkgName);
+    }
+}
+/**
+ * Find installed packages whose pre-bundle output would smuggle JSX into
+ * Vite's import-analysis stage. Returned names are safe to drop into
+ * `optimizeDeps.exclude` — the dev server will serve them through the
+ * normal module pipeline, where `vite-plugin-solid` can transform their
+ * original `.jsx`/`.tsx` files.
+ *
+ * The function is intentionally synchronous and best-effort: filesystem
+ * errors are swallowed, missing directories are skipped, and the scan
+ * caps at {@link MAX_SCAN_DEPTH} levels per package. Callers should
+ * treat the empty-array result as "no exclusions needed", not "scan
+ * failed". A nullable `monorepoRoot` is accepted so workspace hoisting
+ * is covered without forcing every caller to compute it.
+ */
+export function findSolidPackagesShippingJsx(projectRoot, monorepoRoot) {
+    const found = new Set();
+    const seenDirs = new Set();
+    const scanDirs = [];
+    const projectNodeModules = path.resolve(projectRoot, 'node_modules');
+    scanDirs.push(projectNodeModules);
+    if (monorepoRoot && path.resolve(monorepoRoot) !== path.resolve(projectRoot)) {
+        const monorepoNodeModules = path.resolve(monorepoRoot, 'node_modules');
+        scanDirs.push(monorepoNodeModules);
+    }
+    for (const dir of scanDirs) {
+        const key = path.resolve(dir);
+        if (seenDirs.has(key))
+            continue;
+        seenDirs.add(key);
+        if (!fs.existsSync(dir))
+            continue;
+        scanDirectoryForJsxPackages(dir, found);
+    }
+    return Array.from(found).sort();
+}
+//# sourceMappingURL=solid-jsx-deps.js.map

package/hmr/frameworks/solid/build/solid-jsx-deps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solid-jsx-deps.js","sourceRoot":"","sources":["../../../../../../../packages/vite/hmr/frameworks/solid/build/solid-jsx-deps.ts"],"names":[],"mappings":"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"}

package/hmr/frameworks/solid/client/app-runtime.d.ts

@@ -0,0 +1,68 @@
+/**
+ * Bootstrap + HMR remount for NativeScript Solid apps.
+ *
+ * Solid runs with `hot: false` (solid-refresh is off — it rewrites `export
+ * function` into a non-hoisted const and breaks TanStack file-route modules), so
+ * there is no fine-grained component HMR.
+ *
+ * Division of labour on each Solid HMR cycle (`__ns_solid_hmr_subscribe`):
+ *   • ROUTE files — handled by @nativescript/tanstack-router's per-page remount
+ *     (`subscribeSolidHmrRemount` → `page.__ns_remount`), which swaps the route
+ *     component in place WITHOUT re-navigating, so the user stays on their route.
+ *     This helper does nothing for route-only edits.
+ *   • Everything else (app shell / shared components / app entry) — this helper
+ *     re-imports the app entry and re-renders the whole Solid tree. The router is
+ *     REUSED (its chain is never evicted), so the current route is preserved.
+ *
+ * Renderer bindings (`Application`, `render`, `document`) are passed in rather than
+ * imported here so the helper uses the app's exact solid-js / dominative instances.
+ * Importing our own copies could resolve to a different module realm and break
+ * Solid reactivity (NativeScript can load a package's deps in a separate realm).
+ */
+export interface StartSolidAppOptions {
+    /** `@nativescript/core` `Application`. */
+    Application: {
+        run(entry: {
+            create: () => any;
+        }): void;
+    };
+    /** `@nativescript-community/solid-js` `render` — mounts a component, returns a disposer. */
+    render: (component: any, target: any) => () => void;
+    /** dominative `document` — returned as the root view; `document.body` is the mount target. */
+    document: any;
+    /** Initial root component (used for the first mount). */
+    root: any;
+    /**
+     * App-relative specifier of the module that exports the root component, as
+     * `App` or default (e.g. `/src/native/app`). Re-imported fresh on each cycle.
+     */
+    rootModule: string;
+    /**
+     * Optional `@nativescript/core` `Frame` class. Pass it when the app uses a
+     * topmost-frame router (e.g. solid-navigation's `StackRouter` with
+     * `useTopMostFrame`): those routers re-run their initial navigation against
+     * `Frame.topmost()` when the fresh tree mounts. During a remount that would
+     * target a STALE frame from the old tree (often a nested tab frame) and push
+     * a backstack entry per edit. With `Frame` provided, the remount render
+     * redirects such navigations to the ROOT frame (`document.documentElement`)
+     * with `clearHistory: true`, so each HMR apply swaps the whole tree in place
+     * and disposes the old pages instead of stacking on top of them.
+     */
+    Frame?: any;
+}
+/**
+ * Boot a NativeScript Solid app and wire up HMR remounting. Call once from the
+ * app entry, e.g.:
+ *
+ *   import './utils/dom';
+ *   import { Application, Frame } from '@nativescript/core';
+ *   import { render } from '@nativescript-community/solid-js';
+ *   import { document } from 'dominative';
+ *   import { startSolidApp } from '@nativescript/vite/solid-bootstrap';
+ *   import { App } from './app';
+ *
+ *   // `Frame` is optional — pass it when using a topmost-frame router
+ *   // (solid-navigation) so HMR remounts replace the root page in place.
+ *   startSolidApp({ Application, render, document, Frame, root: App, rootModule: '/src/native/app' });
+ */
+export declare function startSolidApp(options: StartSolidAppOptions): void;

package/hmr/frameworks/solid/client/app-runtime.js

@@ -0,0 +1,246 @@
+const SCRIPT_EXT = /\.(?:tsx|jsx|ts|js|mjs|mts|cjs|cts)$/i;
+const ROUTE_FILE_RE = /\/routes\/.+\.(?:tsx|jsx)$/i;
+const isSource = (id) => SCRIPT_EXT.test(id) && !/\.d\.ts$/i.test(id);
+// A "shell" change is any source file that is NOT a route file — route files are
+// hot-swapped per-page by the router, shell files need an app re-render.
+const isShell = (id) => isSource(id) && !ROUTE_FILE_RE.test(id);
+/** Resolve the dev-server HTTP origin used to fetch app modules over the wire. */
+function resolveOrigin() {
+    try {
+        const m = String(import.meta.url).match(/^https?:\/\/[^/]+/);
+        if (m)
+            return m[0];
+    }
+    catch { }
+    const g = globalThis;
+    if (typeof g.__NS_HTTP_ORIGIN__ === 'string' && /^https?:\/\//.test(g.__NS_HTTP_ORIGIN__)) {
+        return g.__NS_HTTP_ORIGIN__;
+    }
+    if (typeof g.__NS_HMR_WS_URL__ === 'string') {
+        const m = g.__NS_HMR_WS_URL__.match(/^wss?:\/\/([^/]+)/);
+        if (m)
+            return 'http://' + m[1];
+    }
+    return '';
+}
+/** Canonical `/ns/m/<path>` eviction URLs (with + without script extension). */
+function evictionUrls(origin, specs) {
+    const urls = new Set();
+    for (const raw of specs) {
+        if (!raw)
+            continue;
+        let spec = raw.split('?')[0];
+        if (!spec.startsWith('/'))
+            spec = '/' + spec;
+        const canonical = spec.replace(SCRIPT_EXT, '');
+        urls.add(origin + '/ns/m' + canonical);
+        if (spec !== canonical)
+            urls.add(origin + '/ns/m' + spec);
+        for (const ext of ['.tsx', '.ts', '.jsx', '.js'])
+            urls.add(origin + '/ns/m' + canonical + ext);
+    }
+    return Array.from(urls);
+}
+/**
+ * Boot a NativeScript Solid app and wire up HMR remounting. Call once from the
+ * app entry, e.g.:
+ *
+ *   import './utils/dom';
+ *   import { Application, Frame } from '@nativescript/core';
+ *   import { render } from '@nativescript-community/solid-js';
+ *   import { document } from 'dominative';
+ *   import { startSolidApp } from '@nativescript/vite/solid-bootstrap';
+ *   import { App } from './app';
+ *
+ *   // `Frame` is optional — pass it when using a topmost-frame router
+ *   // (solid-navigation) so HMR remounts replace the root page in place.
+ *   startSolidApp({ Application, render, document, Frame, root: App, rootModule: '/src/native/app' });
+ */
+export function startSolidApp(options) {
+    const { Application, render, document, root, rootModule, Frame } = options;
+    let dispose;
+    const mount = (Component) => {
+        const isRemount = !!dispose;
+        if (dispose) {
+            try {
+                dispose();
+            }
+            catch (err) {
+                console.log('[ns-solid-hmr] dispose error', err);
+            }
+            dispose = undefined;
+            // Rapid remounts can leave a detached native view parented to body; drop
+            // any residue so each remount starts clean (else ghost/overlapping views).
+            try {
+                const body = document.body;
+                while (body && body.firstChild)
+                    body.removeChild(body.firstChild);
+            }
+            catch (err) {
+                console.log('[ns-solid-hmr] body clear error', err);
+            }
+        }
+        // Solid flushes onMount effects synchronously inside render(), so a
+        // topmost-frame router's initial navigation happens within this window.
+        const closeNavWindow = isRemount ? openRemountNavRedirect(Frame, document) : undefined;
+        try {
+            dispose = render(Component, document.body);
+        }
+        finally {
+            closeNavWindow?.();
+        }
+    };
+    Application.run({ create: () => (mount(root), document) });
+    installHmrRemount(rootModule, mount);
+}
+/**
+ * While the fresh tree renders during an HMR remount, rewrite page navigations
+ * (`frame.navigate({ create })`) to target the ROOT frame with
+ * `clearHistory: true`. Topmost-frame routers (solid-navigation) resolve
+ * `Frame.topmost()` at navigation time — mid-remount that is a stale frame from
+ * the OLD tree (e.g. a tab's nested frame), so without the redirect each HMR
+ * apply would nest the new app inside the old one and grow the backstack.
+ * Clearing history on the root frame also disposes the old page hierarchy,
+ * which runs the per-page Solid disposers registered by the router.
+ * Returns a close function that restores the original `navigate`.
+ */
+function openRemountNavRedirect(Frame, document) {
+    const proto = Frame?.prototype;
+    const rootFrame = document?.documentElement;
+    if (!proto || typeof proto.navigate !== 'function' || !rootFrame)
+        return undefined;
+    const original = proto.navigate;
+    let closed = false;
+    proto.navigate = function (entry) {
+        // Only redirect navigations that target a STALE frame — one that already
+        // shows a page from the old tree (the router's `Frame.topmost()` pick, or
+        // the root frame itself). Frames created by the fresh render (e.g. tab
+        // item frames receiving their first page via dominative's insert) have no
+        // `currentPage` yet and must navigate themselves, untouched.
+        if (entry && typeof entry === 'object' && typeof entry.create === 'function' && this.currentPage) {
+            console.log('[ns-solid-hmr] remount: redirecting navigation to root frame (clearHistory)');
+            return original.call(rootFrame, { ...entry, clearHistory: true, animated: false });
+        }
+        // eslint-disable-next-line prefer-rest-params -- forwards all args verbatim to the original
+        return original.apply(this, arguments);
+    };
+    return () => {
+        if (closed)
+            return;
+        closed = true;
+        proto.navigate = original;
+    };
+}
+function installHmrRemount(rootModule, mount) {
+    const origin = resolveOrigin();
+    let busy = false;
+    let rerun = false;
+    const remount = async (changed) => {
+        if (!origin) {
+            console.log('[ns-solid-hmr] no HTTP origin resolved; cannot re-import');
+            return;
+        }
+        if (busy) {
+            // A remount is in flight; run one more pass after it settles so the very
+            // latest edit is never dropped.
+            rerun = true;
+            return;
+        }
+        busy = true;
+        try {
+            // Evict the app entry + changed files + every module on the reverse-import
+            // chain between them (`ev.ancestors`). Module identity is the URL, so if an
+            // intermediate importer (e.g. `home.tsx` importing a changed
+            // `listen-now.tsx`) stayed cached, re-importing the root would splice the
+            // STALE subtree back into the fresh tree and the edit would never render.
+            // TanStack Router route files are excluded from the shell path by the
+            // subscriber below, so its live router chain is untouched for route-only
+            // edits. Inline `__NS_DEV__` read — this module is served to the device
+            // standalone, so it stays import-free.
+            const g = globalThis;
+            const invalidate = g.__NS_DEV__?.invalidateModules;
+            if (typeof invalidate === 'function') {
+                try {
+                    invalidate(evictionUrls(origin, [rootModule, ...changed]));
+                }
+                catch (err) {
+                    console.log('[ns-solid-hmr] invalidate threw', err);
+                }
+            }
+            // Canonical URL only. The eviction above armed the runtime's
+            // bust-next-fetch nonce, so this import re-fetches the freshly
+            // transformed module — a path tag would mint a second module
+            // identity instead (module identity IS the URL).
+            const candidates = [origin + '/ns/m' + rootModule];
+            for (const url of candidates) {
+                try {
+                    const mod = await import(/* @vite-ignore */ url);
+                    const Next = mod && (mod.App || mod.default);
+                    if (typeof Next === 'function') {
+                        mount(Next);
+                        return;
+                    }
+                }
+                catch (err) {
+                    console.log('[ns-solid-hmr] re-import failed', url, err?.message ?? err);
+                }
+            }
+            console.log('[ns-solid-hmr] all re-import candidates failed');
+        }
+        finally {
+            busy = false;
+            if (rerun) {
+                rerun = false;
+                void remount([]);
+            }
+        }
+    };
+    // Coalesce bursts (a single save can fan out several notifications) into one remount.
+    let timer;
+    let pending = new Set();
+    const schedule = (ids) => {
+        for (const id of ids)
+            pending.add(id);
+        if (timer)
+            clearTimeout(timer);
+        timer = setTimeout(() => {
+            timer = undefined;
+            const batch = Array.from(pending);
+            pending = new Set();
+            void remount(batch);
+        }, 30);
+    };
+    const g = globalThis;
+    let subscribed = false;
+    const trySubscribe = (attempt) => {
+        if (subscribed)
+            return;
+        if (typeof g.__ns_solid_hmr_subscribe === 'function') {
+            g.__ns_solid_hmr_subscribe((ev) => {
+                const changed = ev && Array.isArray(ev.changedFiles) ? ev.changedFiles : [];
+                const boundaries = ev && Array.isArray(ev.boundaries) ? ev.boundaries : [];
+                const ids = [...changed, ...boundaries].filter(isSource);
+                // Route-only edits are hot-swapped in place by the router's per-page
+                // remount — don't re-render the whole app (which would fight it). Only
+                // re-render for shell / shared-component / app-entry edits. The
+                // shell/route decision is made from changed + boundaries ONLY;
+                // ancestors always reach up to the app entry, so including them here
+                // would misclassify every route edit as a shell edit.
+                if (!ids.some(isShell))
+                    return;
+                // Evict the full importer chain (changed → … → entry) so the root
+                // re-import below rebuilds the whole tree from fresh modules instead
+                // of splicing cached stale intermediates back in.
+                const ancestors = ev && Array.isArray(ev.ancestors) ? ev.ancestors.filter(isSource) : [];
+                schedule([...ids, ...ancestors]);
+            });
+            subscribed = true;
+            return;
+        }
+        // The HMR client loads asynchronously; retry until its global API is present.
+        if (attempt < 100)
+            setTimeout(() => trySubscribe(attempt + 1), 150);
+    };
+    trySubscribe(0);
+}
+//# sourceMappingURL=app-runtime.js.map

package/hmr/frameworks/solid/client/app-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-runtime.js","sourceRoot":"","sources":["../../../../../../../packages/vite/hmr/frameworks/solid/client/app-runtime.ts"],"names":[],"mappings":"AAiDA,MAAM,UAAU,GAAG,uCAAuC,CAAC;AAC3D,MAAM,aAAa,GAAG,6BAA6B,CAAC;AACpD,MAAM,QAAQ,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC9E,iFAAiF;AACjF,yEAAyE;AACzE,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAExE,kFAAkF;AAClF,SAAS,aAAa;IACrB,IAAI,CAAC;QACJ,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,MAAM,CAAC,GAAG,UAAiB,CAAC;IAC5B,IAAI,OAAO,CAAC,CAAC,kBAAkB,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC3F,OAAO,CAAC,CAAC,kBAAkB,CAAC;IAC7B,CAAC;IACD,IAAI,OAAO,CAAC,CAAC,iBAAiB,KAAK,QAAQ,EAAE,CAAC;QAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACzD,IAAI,CAAC;YAAE,OAAO,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AAED,gFAAgF;AAChF,SAAS,YAAY,CAAC,MAAc,EAAE,KAAe;IACpD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;QACvC,IAAI,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;QAC1D,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC;IAChG,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAC,OAA6B;IAC1D,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAE3E,IAAI,OAAiC,CAAC;IACtC,MAAM,KAAK,GAAG,CAAC,SAAc,EAAE,EAAE;QAChC,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC;QAC5B,IAAI,OAAO,EAAE,CAAC;YACb,IAAI,CAAC;gBACJ,OAAO,EAAE,CAAC;YACX,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;YACD,OAAO,GAAG,SAAS,CAAC;YACpB,yEAAyE;YACzE,2EAA2E;YAC3E,IAAI,CAAC;gBACJ,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBAC3B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU;oBAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;QACF,CAAC;QACD,oEAAoE;QACpE,wEAAwE;QACxE,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvF,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;gBAAS,CAAC;YACV,cAAc,EAAE,EAAE,CAAC;QACpB,CAAC;IACF,CAAC,CAAC;IAEF,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE3D,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,sBAAsB,CAAC,KAAU,EAAE,QAAa;IACxD,MAAM,KAAK,GAAG,KAAK,EAAE,SAAS,CAAC;IAC/B,MAAM,SAAS,GAAG,QAAQ,EAAE,eAAe,CAAC;IAC5C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,UAAU,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACnF,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,CAAC,QAAQ,GAAG,UAAU,KAAU;QACpC,yEAAyE;QACzE,0EAA0E;QAC1E,uEAAuE;QACvE,0EAA0E;QAC1E,6DAA6D;QAC7D,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAClG,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;YAC3F,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,4FAA4F;QAC5F,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,SAAgB,CAAC,CAAC;IAC/C,CAAC,CAAC;IACF,OAAO,GAAG,EAAE;QACX,IAAI,MAAM;YAAE,OAAO;QACnB,MAAM,GAAG,IAAI,CAAC;QACd,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAkB,EAAE,KAAuB;IACrE,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,EAAE,OAAiB,EAAiB,EAAE;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;YACxE,OAAO;QACR,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACV,yEAAyE;YACzE,gCAAgC;YAChC,KAAK,GAAG,IAAI,CAAC;YACb,OAAO;QACR,CAAC;QACD,IAAI,GAAG,IAAI,CAAC;QACZ,IAAI,CAAC;YACJ,2EAA2E;YAC3E,4EAA4E;YAC5E,6DAA6D;YAC7D,0EAA0E;YAC1E,0EAA0E;YAC1E,sEAAsE;YACtE,yEAAyE;YACzE,wEAAwE;YACxE,uCAAuC;YACvC,MAAM,CAAC,GAAQ,UAAU,CAAC;YAC1B,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC;YACnD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;gBACtC,IAAI,CAAC;oBACJ,UAAU,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;gBACrD,CAAC;YACF,CAAC;YACD,6DAA6D;YAC7D,+DAA+D;YAC/D,6DAA6D;YAC7D,iDAAiD;YACjD,MAAM,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC,CAAC;YACnD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAC9B,IAAI,CAAC;oBACJ,MAAM,GAAG,GAAQ,MAAM,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;oBACtD,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC7C,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;wBAChC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACZ,OAAO;oBACR,CAAC;gBACF,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,GAAG,EAAG,GAAW,EAAE,OAAO,IAAI,GAAG,CAAC,CAAC;gBACnF,CAAC;YACF,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YACV,IAAI,GAAG,KAAK,CAAC;YACb,IAAI,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,KAAK,CAAC;gBACd,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;YAClB,CAAC;QACF,CAAC;IACF,CAAC,CAAC;IAEF,sFAAsF;IACtF,IAAI,KAAgD,CAAC;IACrD,IAAI,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,QAAQ,GAAG,CAAC,GAAa,EAAE,EAAE;QAClC,KAAK,MAAM,EAAE,IAAI,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YACvB,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;YACpB,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC,CAAC;IAEF,MAAM,CAAC,GAAG,UAAiB,CAAC;IAC5B,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE;QACxC,IAAI,UAAU;YAAE,OAAO;QACvB,IAAI,OAAO,CAAC,CAAC,wBAAwB,KAAK,UAAU,EAAE,CAAC;YACtD,CAAC,CAAC,wBAAwB,CAAC,CAAC,EAAO,EAAE,EAAE;gBACtC,MAAM,OAAO,GAAG,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5E,MAAM,UAAU,GAAG,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,MAAM,GAAG,GAAG,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACzD,qEAAqE;gBACrE,uEAAuE;gBACvE,gEAAgE;gBAChE,+DAA+D;gBAC/D,qEAAqE;gBACrE,sDAAsD;gBACtD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;oBAAE,OAAO;gBAC/B,kEAAkE;gBAClE,qEAAqE;gBACrE,kDAAkD;gBAClD,MAAM,SAAS,GAAG,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzF,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YACH,UAAU,GAAG,IAAI,CAAC;YAClB,OAAO;QACR,CAAC;QACD,8EAA8E;QAC9E,IAAI,OAAO,GAAG,GAAG;YAAE,UAAU,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC,CAAC;IACF,YAAY,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC"}