@typed/navigation 0.17.0 → 0.18.1

package/dist/{esm/internal → internal}/shared.js

@@ -1,25 +1,54 @@
-import * as HttpClient from "@effect/platform/HttpClient";
-import { Schema } from "@effect/schema";
-import * as RefSubject from "@typed/fx/RefSubject";
-import { GetRandomValues, makeUuid } from "@typed/id";
-import * as Effect from "effect/Effect";
-import * as Either from "effect/Either";
-import * as Option from "effect/Option";
-import { Destination, Transition } from "../Navigation.js";
+import * as Headers from '@effect/platform/Headers';
+import * as HttpClient from '@effect/platform/HttpClient';
+import { GetRandomValues, makeUuid4 } from '@typed/id';
+import * as LazyRef from '@typed/lazy-ref';
+import { Cause, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Either from 'effect/Either';
+import * as Option from 'effect/Option';
+import { Destination } from '../Destination.js';
+import { FormSubmitError, } from '../Error.js';
+import { TransitionEvent } from '../Event.js';
 export const NavigationState = Schema.Struct({
     entries: Schema.Array(Destination),
     index: Schema.Number,
-    transition: Schema.OptionFromNullishOr(Transition, null)
+    transition: Schema.OptionFromNullishOr(TransitionEvent, null),
 });
-export const getUrl = (origin, urlOrPath) => {
-    return typeof urlOrPath === "string" ? new URL(urlOrPath, origin) : urlOrPath;
-};
+export function getUrl(origin, urlOrPath, base) {
+    if (typeof urlOrPath === 'string') {
+        const url = new URL(urlOrPath, origin);
+        // If the URL is relative, join it with the base
+        if (isRelativeUrl(urlOrPath)) {
+            url.pathname = joinPath(base, url.pathname);
+        }
+        return url;
+    }
+    return urlOrPath;
+}
+function isRelativeUrl(url) {
+    if (url.includes('://'))
+        return false;
+    return true;
+}
+function joinPath(a, b) {
+    const aEndsWithSlash = a[a.length - 1] === '/';
+    const bStartsWithSlash = b[0] === '/';
+    if (aEndsWithSlash && bStartsWithSlash) {
+        return a + b.slice(1);
+    }
+    if (!aEndsWithSlash && !bStartsWithSlash) {
+        return `${a}/${b}`;
+    }
+    return a + b;
+}
 const REDIRECT_STATUS_CODES = new Set([301, 302, 303, 307, 308]);
 export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomValues, newNavigationState) {
-    const { beforeHandlers, canGoBack, canGoForward, commit, formDataHandlers, handlers, state } = modelAndIntent;
-    const entries = RefSubject.map(state, (s) => s.entries);
-    const currentEntry = RefSubject.map(state, (s) => s.entries[s.index]);
-    const transition = RefSubject.map(state, (s) => s.transition);
+    const { beforeHandlers, commit, handlers, state } = modelAndIntent;
+    const canGoBack = LazyRef.map(state, (s) => s.index > 0);
+    const canGoForward = LazyRef.map(state, (s) => s.index < s.entries.length - 1);
+    const entries = LazyRef.map(state, (s) => s.entries);
+    const currentEntry = LazyRef.map(state, (s) => s.entries[s.index]);
+    const transition = LazyRef.map(state, (s) => s.transition);
     const runBeforeHandlers = (event) => Effect.gen(function* () {
         const handlers = yield* beforeHandlers;
         const matches = [];
@@ -27,7 +56,7 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
             const exit = yield* handler(event).pipe(Effect.provide(ctx), Effect.either);
             if (Either.isRight(exit)) {
                 const match = exit.right;
-                if (Option.isSome(match)) {
+                if (match !== undefined && Option.isSome(match)) {
                     matches.push(Effect.provide(match.value, ctx));
                 }
             }
@@ -50,7 +79,7 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
         const matches = [];
         for (const [handler, ctx] of eventHandlers) {
             const match = yield* Effect.provide(handler(event), ctx);
-            if (Option.isSome(match)) {
+            if (match !== undefined && Option.isSome(match)) {
                 matches.push(Effect.provide(match.value, ctx));
             }
         }
@@ -58,53 +87,24 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
             yield* Effect.all(matches, { discard: true });
         }
     });
-    const runFormDataHandlers = (event) => Effect.gen(function* () {
-        const handlers = yield* formDataHandlers;
-        const matches = [];
-        for (const [handler, ctx] of handlers) {
-            const exit = yield* handler(event).pipe(Effect.provide(ctx), Effect.either);
-            if (Either.isRight(exit)) {
-                const match = exit.right;
-                if (Option.isSome(match)) {
-                    matches.push(Effect.provide(match.value, ctx));
-                }
-            }
-            else {
-                return Either.left(exit.left);
-            }
-        }
-        if (matches.length > 0) {
-            for (const match of matches) {
-                const exit = yield* Effect.either(match);
-                if (Either.isLeft(exit)) {
-                    return Either.left(exit.left);
-                }
-                else if (Option.isSome(exit.right)) {
-                    return Either.right(exit.right);
-                }
-            }
-        }
-        else {
-            // Only if there are 0 matches, we'll make a request to the server ourselves
-            const response = yield* makeFormDataRequest(event, Option.getOrElse(event.action, () => event.from.url.href));
-            return Either.right(Option.some(response));
-        }
-        return Either.right(Option.none());
-    });
     const runNavigationEvent = (beforeEvent, get, set, depth, skipCommit = false) => Effect.gen(function* () {
-        let current = yield* get;
-        current = yield* set({ ...current, transition: Option.some(beforeEvent) });
+        const current = yield* set({
+            ...(yield* get),
+            transition: Option.some(beforeEvent),
+        });
         if (!skipCommit) {
             const beforeError = yield* runBeforeHandlers(beforeEvent);
             if (Option.isSome(beforeError)) {
                 return yield* handleError(beforeError.value, get, set, depth);
             }
         }
-        const to = isDestination(beforeEvent.to) ? beforeEvent.to : yield* upgradeProposedDestination(beforeEvent.to);
+        const to = isDestination(beforeEvent.to)
+            ? beforeEvent.to
+            : yield* upgradeProposedDestination(beforeEvent.to);
         if (!skipCommit) {
             yield* commit(to, beforeEvent);
         }
-        if (newNavigationState) {
+        if (newNavigationState !== undefined) {
             const { entries, index } = yield* set(newNavigationState());
             return entries[index];
         }
@@ -112,59 +112,63 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
             const event = {
                 type: beforeEvent.type,
                 info: beforeEvent.info,
-                destination: to
+                destination: to,
             };
-            if (beforeEvent.type === "push") {
+            if (beforeEvent.type === 'push') {
                 const index = current.index + 1;
                 const entries = current.entries.slice(0, index).concat([to]);
                 yield* set({ entries, index, transition: Option.none() });
             }
-            else if (beforeEvent.type === "replace") {
+            else if (beforeEvent.type === 'replace') {
                 const index = current.index;
                 const before = current.entries.slice(0, index);
                 const after = current.entries.slice(index + 1);
                 const entries = [...before, to, ...after];
                 yield* set({ entries, index, transition: Option.none() });
             }
-            else if (beforeEvent.type === "reload") {
+            else if (beforeEvent.type === 'reload') {
                 yield* set({ ...current, transition: Option.none() });
             }
             else {
                 const { delta } = beforeEvent;
                 const nextIndex = current.index + delta;
-                yield* set({ ...current, index: nextIndex, transition: Option.none() });
+                yield* set({
+                    ...current,
+                    index: nextIndex,
+                    transition: Option.none(),
+                });
             }
             yield* runHandlers(event);
         }
         return to;
-    }).pipe(GetRandomValues.provide(getRandomValues));
+    }).pipe(Effect.provideService(GetRandomValues, getRandomValues));
     const handleError = (error, get, set, depth) => Effect.gen(function* () {
         if (depth >= 25) {
-            return yield* Effect.dieMessage(`Redirect loop detected.`);
+            return yield* Effect.dieMessage('Redirect loop detected.');
         }
         const { entries, index } = yield* get;
         const from = entries[index];
-        if (error._tag === "CancelNavigation") {
+        if (error._tag === 'CancelNavigation') {
             yield* set({ entries, index, transition: Option.none() });
             return from;
         }
         else {
-            const event = yield* makeRedirectEvent(origin, error, from);
+            const event = yield* makeRedirectEvent(origin, error, from, base);
             return yield* runNavigationEvent(event, get, set, depth + 1);
         }
-    }).pipe(GetRandomValues.provide(getRandomValues));
+    }).pipe(Effect.provideService(GetRandomValues, getRandomValues));
     const navigate = (pathOrUrl, options, skipCommit = false) => state.runUpdates(({ get, set }) => Effect.gen(function* () {
         const state = yield* get;
         const from = state.entries[state.index];
-        const history = options?.history ?? "auto";
-        const to = yield* makeOrUpdateDestination(state, getUrl(origin, pathOrUrl), options?.state, origin).pipe(GetRandomValues.provide(getRandomValues));
-        const type = history === "auto" ? from.key === to.key ? "replace" : "push" : history;
+        const history = options?.history ?? 'auto';
+        const to = yield* makeOrUpdateDestination(state, getUrl(origin, pathOrUrl, base), options?.state, origin).pipe(Effect.provideService(GetRandomValues, getRandomValues));
+        const type = history === 'auto' ? (from.key === to.key ? 'replace' : 'push') : history;
         const event = {
             type,
             from,
             to,
-            delta: type === "replace" ? 0 : 1,
-            info: options?.info
+            delta: type === 'replace' ? 0 : 1,
+            info: options?.info,
         };
         return yield* runNavigationEvent(event, get, set, 0, skipCommit);
     }));
@@ -175,15 +179,15 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
         const nextIndex = entries.findIndex((e) => e.key === key);
         if (nextIndex === -1)
             return from;
-        const id = yield* makeUuid.pipe(GetRandomValues.provide(getRandomValues));
+        const id = yield* makeUuid4.pipe(Effect.provideService(GetRandomValues, getRandomValues));
         const to = { ...entries[nextIndex], id };
         const delta = nextIndex - index;
         const event = {
-            type: "traverse",
+            type: 'traverse',
             from,
             to,
             delta,
-            info: options?.info
+            info: options?.info,
         };
         return yield* runNavigationEvent(event, get, set, 0, skipCommit);
     }));
@@ -205,82 +209,61 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
         const { entries, index } = yield* state;
         const current = entries[index];
         const event = {
-            type: "reload",
+            type: 'reload',
             from: current,
             to: current,
             delta: 0,
-            info: options?.info
+            info: options?.info,
         };
         return yield* runNavigationEvent(event, get, set, 0, skipCommit);
     }));
     const beforeNavigation = (handler) => Effect.contextWithEffect((ctx) => {
         const entry = [handler, ctx];
-        return Effect.zipRight(RefSubject.update(beforeHandlers, (handlers) => new Set([...handlers, entry])), Effect.addFinalizer(() => RefSubject.update(beforeHandlers, (handlers) => {
+        const acquire = LazyRef.update(beforeHandlers, (handlers) => new Set([...handlers, entry]));
+        const release = Effect.ignoreLogged(LazyRef.update(beforeHandlers, (handlers) => {
             const updated = new Set(handlers);
             updated.delete(entry);
             return updated;
-        })));
+        }));
+        return Effect.acquireRelease(acquire, () => release);
     });
     const onNavigation = (handler) => Effect.contextWithEffect((ctx) => {
         const entry = [handler, ctx];
-        return Effect.zipRight(RefSubject.update(handlers, (handlers) => new Set([...handlers, entry])), Effect.addFinalizer(() => RefSubject.update(handlers, (handlers) => {
+        const acquire = LazyRef.update(handlers, (handlers) => new Set([...handlers, entry]));
+        const release = Effect.ignoreLogged(LazyRef.update(handlers, (handlers) => {
             const updated = new Set(handlers);
             updated.delete(entry);
             return updated;
-        })));
+        }));
+        return Effect.acquireRelease(acquire, () => release);
     });
     const updateCurrentEntry = (options) => state.runUpdates(({ get, set }) => Effect.gen(function* () {
         const { entries, index } = yield* get;
         const current = entries[index];
         const event = {
-            type: "replace",
+            type: 'replace',
             from: current,
             to: { ...current, state: options.state },
             delta: 0,
-            info: null
+            info: null,
         };
         return yield* runNavigationEvent(event, get, set, 0);
     }));
-    const submit = (data, input) => state.runUpdates(({ get, set }) => Effect.gen(function* () {
-        const { entries, index } = yield* get;
-        const from = entries[index];
-        const event = {
-            from,
-            data,
-            name: Option.fromNullable(input?.name),
-            action: Option.fromNullable(input?.action),
-            method: Option.fromNullable(input?.method),
-            encoding: Option.fromNullable(input?.encoding)
-        };
-        const either = yield* runFormDataHandlers(event);
-        if (Either.isLeft(either)) {
-            yield* handleError(either.left, get, set, 0);
-            return Option.none();
-        }
-        else {
-            if (Option.isNone(either.right)) {
-                return either.right;
+    const submit = (form) => Effect.gen(function* () {
+        const current = yield* currentEntry;
+        // Utilize the action URL if provided, otherwise use the current URL
+        const url = form.action ? getUrl(origin, form.action, base) : current.url;
+        // Submit the HTTP request
+        const response = yield* HttpClient[form.method](url, form).pipe(Effect.mapErrorCause((cause) => Cause.fail(new FormSubmitError({ cause }))));
+        // If the response is a redirect, navigate to the new URL
+        if (REDIRECT_STATUS_CODES.has(response.status)) {
+            // Get the location header
+            const location = Headers.get(response.headers, 'location');
+            if (Option.isSome(location)) {
+                return [yield* navigate(getUrl(origin, location.value, base), form), response];
             }
-            const response = either.right.value;
-            // If it is a redirect
-            if (REDIRECT_STATUS_CODES.has(response.status)) {
-                const location = HttpClient.headers.get(response.headers, "location");
-                // And we have a location header
-                if (Option.isSome(location)) {
-                    // Then we navigate to that location
-                    yield* navigate(location.value, { history: "replace" });
-                }
-            }
-            return Option.some(response);
         }
-    }));
-    const onFormData = (handler) => Effect.contextWithEffect((ctx) => {
-        const entry = [handler, ctx];
-        return Effect.zipRight(RefSubject.update(formDataHandlers, (handlers) => new Set([...handlers, entry])), Effect.addFinalizer(() => RefSubject.update(formDataHandlers, (handlers) => {
-            const updated = new Set(handlers);
-            updated.delete(entry);
-            return updated;
-        })));
+        return [current, response];
     });
     const navigation = {
         back,
@@ -299,20 +282,19 @@ export function setupFromModelAndIntent(modelAndIntent, origin, base, getRandomV
         traverseTo,
         updateCurrentEntry,
         submit,
-        onFormData
     };
     return navigation;
 }
-export function makeRedirectEvent(origin, redirect, from) {
+function makeRedirectEvent(origin, redirect, from, base) {
     return Effect.gen(function* () {
-        const url = getUrl(origin, redirect.path);
+        const url = getUrl(origin, redirect.path, base);
         const to = yield* makeDestination(url, redirect.options?.state, origin);
         const event = {
-            type: "replace",
+            type: 'replace',
             from,
             to,
             delta: 0,
-            info: redirect.options?.info
+            info: redirect.options?.info,
         };
         return event;
     });
@@ -322,13 +304,13 @@ export function makeOrUpdateDestination(navigationState, url, state, origin) {
         const current = navigationState.entries[navigationState.index];
         const isSameOriginAndPath = url.origin === current.url.origin && url.pathname === current.url.pathname;
         if (isSameOriginAndPath) {
-            const id = yield* makeUuid;
+            const id = yield* makeUuid4;
             const destination = {
                 id,
                 key: current.key,
                 url,
                 state: getOriginalState(state),
-                sameDocument: url.origin === origin
+                sameDocument: url.origin === origin,
             };
             return destination;
         }
@@ -341,55 +323,57 @@ export function makeDestination(url, state, origin) {
     return Effect.gen(function* () {
         if (isPatchedState(state)) {
             const destination = {
-                id: state.id,
-                key: state.key,
+                id: state.__typed__navigation__id__,
+                key: state.__typed__navigation__key__,
                 url,
-                state: state.originalHistoryState,
-                sameDocument: url.origin === origin
+                state: state.__typed__navigation__state__,
+                sameDocument: url.origin === origin,
             };
             return destination;
         }
-        const id = yield* makeUuid;
-        const key = yield* makeUuid;
+        const id = yield* makeUuid4;
+        const key = yield* makeUuid4;
         const destination = {
             id,
             key,
             url,
             state,
-            sameDocument: url.origin === origin
+            sameDocument: url.origin === origin,
         };
         return destination;
     });
 }
 export function upgradeProposedDestination(proposed) {
     return Effect.gen(function* () {
-        const id = yield* makeUuid;
-        const key = yield* makeUuid;
+        const id = yield* makeUuid4;
+        const key = yield* makeUuid4;
         const destination = {
             id,
             key,
             url: proposed.url,
             state: proposed.state,
-            sameDocument: proposed.sameDocument
+            sameDocument: proposed.sameDocument,
         };
         return destination;
     });
 }
 export function isPatchedState(state) {
-    if (state === null || !(typeof state === "object") || Array.isArray(state))
+    if (state === null || !(typeof state === 'object') || Array.isArray(state)) {
         return false;
-    if ("id" in state && "key" in state && "originalHistoryState" in state)
+    }
+    if ('__typed__navigation__id__' in state && '__typed__navigation__key__' in state) {
         return true;
+    }
     return false;
 }
 export function getOriginalState(state) {
     if (isPatchedState(state))
-        return state.originalHistoryState;
+        return state.__typed__navigation__state__;
     return state;
 }
 export function getOriginFromUrl(url) {
     try {
-        if (typeof url === "string") {
+        if (typeof url === 'string') {
             return new URL(url).origin;
         }
         else {
@@ -397,34 +381,19 @@ export function getOriginFromUrl(url) {
         }
     }
     catch {
-        return "http://localhost";
+        return 'http://localhost';
     }
 }
 export function isDestination(proposed) {
-    return "id" in proposed && "key" in proposed;
+    return 'id' in proposed && 'key' in proposed;
 }
 const strictEqual = (a, b) => a === b;
-export function makeHandlersState() {
-    return Effect.gen(function* () {
-        const beforeHandlers = yield* RefSubject.fromEffect(Effect.sync(() => new Set()), { eq: strictEqual });
-        const handlers = yield* RefSubject.fromEffect(Effect.sync(() => new Set()), { eq: strictEqual });
-        const formDataHandlers = yield* RefSubject.fromEffect(Effect.sync(() => new Set()), { eq: strictEqual });
-        return {
-            beforeHandlers,
-            handlers,
-            formDataHandlers
-        };
-    });
-}
-function makeFormDataRequest(event, url) {
-    const headers = new Headers();
-    if (Option.isSome(event.encoding)) {
-        headers.set("Content-Type", event.encoding.value);
-    }
-    const method = Option.getOrElse(event.method, () => "POST");
-    return Effect.flatMap(HttpClient.client.Client, (client) => client(HttpClient.request.make(method)(url, {
-        headers: HttpClient.headers.fromInput(headers),
-        body: HttpClient.body.formData(event.data)
-    })));
-}
+export const makeHandlersState = Effect.gen(function* () {
+    const beforeHandlers = yield* LazyRef.fromEffect(Effect.sync(() => new Set()), { eq: strictEqual });
+    const handlers = yield* LazyRef.fromEffect(Effect.sync(() => new Set()), { eq: strictEqual });
+    return {
+        beforeHandlers,
+        handlers,
+    };
+});
 //# sourceMappingURL=shared.js.map

package/dist/internal/shared.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/internal/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACnD,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAc,MAAM,WAAW,CAAA;AAClE,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,eAAe,GAIhB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,eAAe,EAAwB,MAAM,aAAa,CAAA;AAcnE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,UAAU,EAAE,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,IAAI,CAAC;CAC9D,CAAC,CAAA;AAEF,MAAM,UAAU,MAAM,CAAC,MAAc,EAAE,SAAuB,EAAE,IAAY;IAC1E,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAEtC,gDAAgD;QAChD,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC7C,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACrC,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,CAAS;IACpC,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAA;IAC9C,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA;IAErC,IAAI,cAAc,IAAI,gBAAgB,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IAED,IAAI,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;IACpB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,CAAA;AACd,CAAC;AAgBD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;AAEhE,MAAM,UAAU,uBAAuB,CACrC,cAA8B,EAC9B,MAAc,EACd,IAAY,EACZ,eAA4D,EAC5D,kBAA0C;IAE1C,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,cAAc,CAAA;IAClE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC9E,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IAClE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAE1D,MAAM,iBAAiB,GAAG,CAAC,KAAsB,EAAE,EAAE,CACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,cAAc,CAAA;QACtC,MAAM,OAAO,GAAoE,EAAE,CAAA;QAEnF,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YAC3E,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;gBACxB,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;oBAChD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;gBAChD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACxC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,IAAI,EAAoC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEJ,MAAM,WAAW,GAAG,CAAC,KAAsB,EAAE,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAA;QACrC,MAAM,OAAO,GAAkC,EAAE,CAAA;QAEjD,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,aAAa,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;YACxD,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;YAChD,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC,CAAC,CAAA;IAEJ,MAAM,kBAAkB,GAAG,CACzB,WAA4B,EAC5B,GAAmC,EACnC,GAA2D,EAC3D,KAAa,EACb,UAAU,GAAG,KAAK,EAC2B,EAAE,CAC/C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;YACzB,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;YACf,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACrC,CAAC,CAAA;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;YAEzD,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;YAC/D,CAAC;QACH,CAAC;QAED,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,CAAC,CAAC,WAAW,CAAC,EAAE;YAChB,CAAC,CAAC,KAAK,CAAC,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;QAErD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;QAChC,CAAC;QAED,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAA;YAE3D,OAAO,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAoB;gBAC7B,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,WAAW,EAAE,EAAE;aAChB,CAAA;YAED,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAChC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;gBAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAE5D,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAC3D,CAAC;iBAAM,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;gBAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;gBAC9C,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAA;gBAEzC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAC3D,CAAC;iBAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACzC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAA;gBAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;gBAEvC,KAAK,CAAC,CAAC,GAAG,CAAC;oBACT,GAAG,OAAO;oBACV,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE;iBAC1B,CAAC,CAAA;YACJ,CAAC;YAED,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;IAElE,MAAM,WAAW,GAAG,CAClB,KAAuC,EACvC,GAAmC,EACnC,GAA2D,EAC3D,KAAa,EACgC,EAAE,CAC/C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAA;QAC5D,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;QACrC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAE3B,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACtC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAEzD,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAEjE,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;IAElE,MAAM,QAAQ,GAAG,CAAC,SAAuB,EAAE,OAAyB,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CAC1F,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACvC,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,MAAM,CAAA;QAC1C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CACvC,KAAK,EACL,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAC/B,OAAO,EAAE,KAAK,EACd,MAAM,CACP,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;QAE/D,MAAM,IAAI,GAAG,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;QACtF,MAAM,KAAK,GAAoB;YAC7B,IAAI;YACJ,IAAI;YACJ,EAAE;YACF,KAAK,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,IAAI,EAAE,OAAO,EAAE,IAAI;SACpB,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAA;IAClE,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,UAAU,GAAG,CACjB,GAAuB,EACvB,OAAqC,EACrC,UAAU,GAAG,KAAK,EAClB,EAAE,CACF,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;QACxB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;QAEzD,IAAI,SAAS,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAA;QAEjC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;QACzF,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAA;QACxC,MAAM,KAAK,GAAG,SAAS,GAAG,KAAK,CAAA;QAC/B,MAAM,KAAK,GAAoB;YAC7B,IAAI,EAAE,UAAU;YAChB,IAAI;YACJ,EAAE;YACF,KAAK;YACL,IAAI,EAAE,OAAO,EAAE,IAAI;SACpB,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAA;IAClE,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,IAAI,GAAG,CAAC,OAAqC,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CACzE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QACvC,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAA;QACtC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QAElC,OAAO,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEJ,MAAM,OAAO,GAAG,CAAC,OAAqC,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CAC5E,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QACvC,IAAI,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QAElC,OAAO,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEJ,MAAM,MAAM,GAAG,CAAC,OAAqC,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CAC3E,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QACvC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAE9B,MAAM,KAAK,GAAoB;YAC7B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,OAAO;YACX,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,OAAO,EAAE,IAAI;SACpB,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAA;IAClE,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,gBAAgB,GAAG,CACvB,OAAuC,EACW,EAAE,CACpD,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,GAAG,CAAU,CAAA;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;QAC3F,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CACjC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAA;YACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACrB,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEJ,MAAM,YAAY,GAAG,CACnB,OAAiC,EACiB,EAAE,CACpD,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,GAAG,CAAU,CAAA;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;QACrF,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CACjC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAA;YACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACrB,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEJ,MAAM,kBAAkB,GAAG,CAAC,OAAoC,EAAE,EAAE,CAClE,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAoB;YAC7B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;YACxC,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,IAAI;SACX,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,MAAM,GAAG,CAAC,IAAgB,EAAE,EAAE,CAClC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;QACnC,oEAAoE;QACpE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;QACzE,0BAA0B;QAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAC7D,MAAM,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAC5E,CAAA;QAED,yDAAyD;QACzD,IAAI,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/C,0BAA0B;YAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;YAC1D,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAU,CAAA;YACzF,CAAC;QACH,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAU,CAAA;IACrC,CAAC,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG;QACjB,IAAI;QACJ,IAAI;QACJ,gBAAgB;QAChB,SAAS;QACT,YAAY;QACZ,YAAY;QACZ,OAAO;QACP,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,MAAM;QACN,MAAM;QACN,UAAU;QACV,UAAU;QACV,kBAAkB;QAClB,MAAM;KACc,CAAA;IAEtB,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAS,iBAAiB,CACxB,MAAc,EACd,QAAuB,EACvB,IAAiB,EACjB,IAAY;IAEZ,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC/C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACvE,MAAM,KAAK,GAAoB;YAC7B,IAAI,EAAE,SAAS;YACf,IAAI;YACJ,EAAE;YACF,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI;SAC7B,CAAA;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,eAAgC,EAChC,GAAQ,EACR,KAAc,EACd,MAAc;IAEd,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;QAC9D,MAAM,mBAAmB,GACvB,GAAG,CAAC,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAA;QAC5E,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;YAC3B,MAAM,WAAW,GAAgB;gBAC/B,EAAE;gBACF,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG;gBACH,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;gBAC9B,YAAY,EAAE,GAAG,CAAC,MAAM,KAAK,MAAM;aACpC,CAAA;YAED,OAAO,WAAW,CAAA;QACpB,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACnD,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAQ,EAAE,KAAc,EAAE,MAAc;IACtE,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAgB;gBAC/B,EAAE,EAAE,KAAK,CAAC,yBAAyB;gBACnC,GAAG,EAAE,KAAK,CAAC,0BAA0B;gBACrC,GAAG;gBACH,KAAK,EAAE,KAAK,CAAC,4BAA4B;gBACzC,YAAY,EAAE,GAAG,CAAC,MAAM,KAAK,MAAM;aACpC,CAAA;YAED,OAAO,WAAW,CAAA;QACpB,CAAC;QAED,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;QAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;QAE5B,MAAM,WAAW,GAAgB;YAC/B,EAAE;YACF,GAAG;YACH,GAAG;YACH,KAAK;YACL,YAAY,EAAE,GAAG,CAAC,MAAM,KAAK,MAAM;SACpC,CAAA;QAED,OAAO,WAAW,CAAA;IACpB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAA6B;IACtE,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;QAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;QAE5B,MAAM,WAAW,GAAgB;YAC/B,EAAE;YACF,GAAG;YACH,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,YAAY,EAAE,QAAQ,CAAC,YAAY;SACpC,CAAA;QAED,OAAO,WAAW,CAAA;IACpB,CAAC,CAAC,CAAA;AACJ,CAAC;AAQD,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,2BAA2B,IAAI,KAAK,IAAI,4BAA4B,IAAI,KAAK,EAAE,CAAC;QAClF,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,4BAA4B,CAAA;IACpE,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAiB;IAChD,IAAI,CAAC;QACH,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;QAC5B,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,CAAC,MAAM,CAAA;QACnB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,kBAAkB,CAAA;IAC3B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA6B;IACzD,OAAO,IAAI,IAAI,QAAQ,IAAI,KAAK,IAAI,QAAQ,CAAA;AAC9C,CAAC;AAED,MAAM,WAAW,GAAG,CAAI,CAAI,EAAE,CAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,CAC9C,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,IAAI,GAAG,EAAsE,CACpF,EACD,EAAE,EAAE,EAAE,WAAW,EAAE,CACpB,CAAA;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,CACxC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAAgE,CAAC,EAC1F,EAAE,EAAE,EAAE,WAAW,EAAE,CACpB,CAAA;IAED,OAAO;QACL,cAAc;QACd,QAAQ;KACT,CAAA;AACH,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,60 +1,43 @@
 {
   "name": "@typed/navigation",
-  "version": "0.17.0",
-  "description": "",
+  "version": "0.18.1",
+  "description": "History/Navigation API for Effect",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "type": "module",
+  "keywords": [
+    "history",
+    "navigation",
+    "effect",
+    "typescript"
+  ],
+  "author": "Tylor Steinberger <tlsteinberger167@gmail.com>",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/tylors/typed.git"
-  },
-  "sideEffects": [],
-  "author": "Typed contributors",
   "dependencies": {
-    "@effect/platform": "^0.57.4",
-    "@effect/schema": "^0.68.1",
-    "effect": "^3.3.5",
-    "@typed/context": "0.29.0",
-    "@typed/dom": "17.0.0",
-    "@typed/fx": "1.31.0",
-    "@typed/id": "0.10.0"
+    "@effect/platform": "^0.72.0",
+    "@typed/id": "^0.17.1",
+    "@typed/lazy-ref": "^0.3.3",
+    "effect": "^3.11.9"
+  },
+  "peerDependencies": {
+    "effect": "^3.11.9"
   },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/dts/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "types": "./dist/dts/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
-    },
-    "./Blocking": {
-      "types": "./dist/dts/Blocking.d.ts",
-      "import": "./dist/esm/Blocking.js",
-      "default": "./dist/cjs/Blocking.js"
-    },
-    "./Layer": {
-      "types": "./dist/dts/Layer.d.ts",
-      "import": "./dist/esm/Layer.js",
-      "default": "./dist/cjs/Layer.js"
-    },
-    "./Navigation": {
-      "types": "./dist/dts/Navigation.d.ts",
-      "import": "./dist/esm/Navigation.js",
-      "default": "./dist/cjs/Navigation.js"
-    }
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
+    "@effect/vitest": "^0.16.0",
+    "@types/dom-navigation": "^1.0.4",
+    "@types/node": "^22.10.2",
+    "@virtualstate/navigation": "1.0.1-alpha.206",
+    "happy-dom": "^16.0.1",
+    "typescript": "^5.4.2",
+    "vitest": "^2.1.8"
   },
-  "typesVersions": {
-    "*": {
-      "Blocking": [
-        "./dist/dts/Blocking.d.ts"
-      ],
-      "Layer": [
-        "./dist/dts/Layer.d.ts"
-      ],
-      "Navigation": [
-        "./dist/dts/Navigation.d.ts"
-      ]
-    }
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "lint": "biome lint --write",
+    "test:watch": "vitest --typecheck",
+    "test": "vitest run --typecheck",
+    "typecheck": "tsc --noEmit"
   }
 }