mobx-route 0.0.73 → 0.0.75

package/core/route/route.d.ts

@@ -1,15 +1,15 @@
 import { History, IQueryParams } from 'mobx-location-history';
 import { ParamData, TokenData } from 'path-to-regexp';
-import { AllPropertiesOptional, AnyObject, Maybe } from 'yummies/utils/types';
-import { AnyRoute, BeforeOpenCheckResult, OpenData, ExtractPathParams, ParsedPathParams, RouteConfiguration, RouteMatchesData, RouteNavigateParams } from './route.types.js';
+import { AllPropertiesOptional, AnyObject, Maybe, MaybePromise } from 'yummies/utils/types';
+import { AnyRoute, BeforeEnterFeedback, PreparedNavigationData, ExtractPathParams, RouteConfiguration, ParsedPathData, RouteNavigateParams } from './route.types.js';
 /**
  * Class for creating path based route.
  *
  * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html)
  */
-export declare class Route<TPath extends string, TParentRoute extends Route<any, any> | null = null> extends String {
+export declare class Route<TPath extends string, TParams extends AnyObject = ExtractPathParams<TPath>, TParentRoute extends Route<any, any, any> | null = null> {
     path: TPath;
-    protected config: RouteConfiguration<TPath, TParentRoute>;
+    protected config: RouteConfiguration<TPath, TParams, TParentRoute>;
     protected abortController: AbortController;
     protected history: History;
     parent: TParentRoute;
@@ -30,9 +30,9 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
      */
     isHash: boolean;
     children: AnyRoute[];
-    constructor(path: TPath, config?: RouteConfiguration<TPath, TParentRoute>);
+    constructor(path: TPath, config?: RouteConfiguration<TPath, TParams, TParentRoute>);
     protected get baseUrl(): string | undefined;
-    protected get data(): RouteMatchesData<TPath> | null;
+    protected get parsedPathData(): ParsedPathData<TPath> | null;
     /**
      * Matched path segment for current URL.
      *
@@ -44,7 +44,7 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
      *
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#params-parsedpathparams-null)
      */
-    get params(): ParsedPathParams<TPath> | null;
+    get params(): TParams | null;
     /**
      * Defines the "open" state for this route.
      *
@@ -56,7 +56,7 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
      *
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#extend-path-config-route)
      */
-    extend<TExtendPath extends string>(path: TExtendPath, config?: Omit<RouteConfiguration<any>, 'parent'>): Route<`${TPath}${TExtendPath}`, this>;
+    extend<TExtendPath extends string, TParams extends AnyObject = ExtractPathParams<`${TPath}${TExtendPath}`>>(path: TExtendPath, config?: Omit<RouteConfiguration<`${TPath}${TExtendPath}`, TParams, any>, 'parent'>): Route<`${TPath}${TExtendPath}`, TParams, this>;
     addChildren(...routes: AnyRoute[]): void;
     removeChildren(...routes: AnyRoute[]): void;
     /**
@@ -73,7 +73,7 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
     open(...args: AllPropertiesOptional<ExtractPathParams<TPath>> extends true ? [
         params?: ExtractPathParams<TPath> | null | undefined,
         navigateParams?: RouteNavigateParams
-    ] : [params: ExtractPathParams<TPath>, navigateParams?: RouteNavigateParams]): void | Promise<void>;
+    ] : [params: ExtractPathParams<TPath>, navigateParams?: RouteNavigateParams]): Promise<void>;
     open(...args: AllPropertiesOptional<ExtractPathParams<TPath>> extends true ? [
         params?: ExtractPathParams<TPath> | null | undefined,
         replace?: RouteNavigateParams['replace'],
@@ -82,11 +82,11 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
         params: ExtractPathParams<TPath>,
         replace?: RouteNavigateParams['replace'],
         query?: RouteNavigateParams['query']
-    ]): void | Promise<void>;
-    open(url: string, navigateParams?: RouteNavigateParams): void | Promise<void>;
-    open(url: string, replace?: RouteNavigateParams['replace'], query?: RouteNavigateParams['query']): void | Promise<void>;
-    protected beforeOpen(openData: OpenData): BeforeOpenCheckResult | Promise<BeforeOpenCheckResult>;
-    private applyOpen;
+    ]): Promise<void>;
+    open(url: string, navigateParams?: RouteNavigateParams): Promise<void>;
+    open(url: string, replace?: RouteNavigateParams['replace'], query?: RouteNavigateParams['query']): Promise<void>;
+    protected beforeOpen(openData: PreparedNavigationData): MaybePromise<BeforeEnterFeedback>;
+    protected afterClose(): true | void;
     protected get tokenData(): TokenData;
     destroy(): void;
 }

package/core/route/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"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"}

package/core/route/route.js

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-const */
 import { LinkedAbortController } from 'linked-abort-controller';
-import { action, computed, makeObservable, observable, reaction } from 'mobx';
+import { action, computed, makeObservable, observable, reaction, when, } from 'mobx';
 import { buildSearchString, } from 'mobx-location-history';
 import { compile, match, parse } from 'path-to-regexp';
 import { routeConfig } from '../config/config.js';
@@ -9,7 +9,7 @@ import { routeConfig } from '../config/config.js';
  *
  * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html)
  */
-export class Route extends String {
+export class Route {
     path;
     config;
     abortController;
@@ -33,7 +33,6 @@ export class Route extends String {
     isHash;
     children = [];
     constructor(path, config = {}) {
-        super(path);
         this.path = path;
         this.config = config;
         this.abortController = new LinkedAbortController(config.abortSignal);
@@ -53,6 +52,9 @@ export class Route extends String {
         action(this, 'addChildren');
         action(this, 'removeChildren');
         makeObservable(this);
+        if (this.config.afterClose) {
+            when(() => !this.isOpened, this.config.afterClose);
+        }
         if (config.onOpen || config.onClose) {
             let firstReactionCall = true;
             reaction(() => this.isOpened, (isOpened) => {
@@ -64,7 +66,7 @@ export class Route extends String {
                     }
                 }
                 if (isOpened) {
-                    config.onOpen?.(this.data, this);
+                    config.onOpen?.(this.parsedPathData, this);
                 }
                 else {
                     config.onClose?.();
@@ -79,7 +81,7 @@ export class Route extends String {
         const baseUrl = this.config.baseUrl ?? routeConfig.get().baseUrl;
         return baseUrl?.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
     }
-    get data() {
+    get parsedPathData() {
         let pathnameToCheck;
         if (this.isHash) {
             pathnameToCheck = this.history.location.hash.slice(1);
@@ -110,7 +112,7 @@ export class Route extends String {
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#currentpath-parsedpathname-null)
      */
     get currentPath() {
-        return this.data?.path ?? null;
+        return this.parsedPathData?.path ?? null;
     }
     /**
      * Current parsed path parameters.
@@ -118,7 +120,20 @@ export class Route extends String {
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#params-parsedpathparams-null)
      */
     get params() {
-        return this.data?.params ?? null;
+        if (!this.parsedPathData?.params) {
+            return null;
+        }
+        let params = this.parsedPathData?.params ?? null;
+        if (this.config.params) {
+            const result = this.config.params(this.parsedPathData.params);
+            if (result) {
+                params = result;
+            }
+            else {
+                return null;
+            }
+        }
+        return params;
     }
     /**
      * Defines the "open" state for this route.
@@ -126,10 +141,10 @@ export class Route extends String {
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#isopened-boolean)
      */
     get isOpened() {
-        if (this.data === null) {
+        if (this.parsedPathData === null) {
             return false;
         }
-        return !this.config.checkOpened || this.config.checkOpened(this.data);
+        return (!this.config.checkOpened || this.config.checkOpened(this.parsedPathData));
     }
     /**
      * Allows to create child route based on this route with merging this route path and extending path.
@@ -138,7 +153,7 @@ export class Route extends String {
      */
     extend(path, config) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { index, ...configFromCurrentRoute } = this.config;
+        const { index, params, ...configFromCurrentRoute } = this.config;
         const extendedChild = new Route(`${this.path}${path}`, {
             ...configFromCurrentRoute,
             ...config,
@@ -186,7 +201,7 @@ export class Route extends String {
      *
      * [**Documentation**](https://js2me.github.io/mobx-route/core/Route.html#open-args)
      */
-    open(...args) {
+    async open(...args) {
         let { replace, state: rawState, query, } = typeof args[1] === 'boolean' || args.length > 2
             ? { replace: args[1], query: args[2] }
             : (args[1] ?? {});
@@ -200,19 +215,25 @@ export class Route extends String {
             url = this.createUrl(args[0], query);
         }
         let state = rawState ?? null;
-        const openData = {
+        const navigationData = {
             url,
             params: params,
             replace,
             state,
             query,
         };
-        const beforeOpenResult = this.beforeOpen(openData);
-        if (beforeOpenResult && beforeOpenResult instanceof Promise) {
-            return beforeOpenResult.then((beforeOpenCheck) => this.applyOpen(openData, beforeOpenCheck));
+        const feedback = await this.beforeOpen(navigationData);
+        if (feedback === false) {
+            return;
+        }
+        if (typeof feedback === 'object') {
+            Object.assign(navigationData, feedback);
+        }
+        if (replace) {
+            this.history.replace(url, state);
         }
         else {
-            this.applyOpen(openData, beforeOpenResult);
+            this.history.push(url, state);
         }
     }
     beforeOpen(openData) {
@@ -221,24 +242,11 @@ export class Route extends String {
         }
         return true;
     }
-    applyOpen(openData, checkResult) {
-        let url = openData.url;
-        let replace = openData.replace;
-        let state = openData.state;
-        if (checkResult === false) {
-            return;
-        }
-        if (typeof checkResult === 'object') {
-            url = checkResult.url;
-            replace = checkResult.replace ?? openData.replace;
-            state = checkResult.state ?? openData.state;
-        }
-        if (replace) {
-            this.history.replace(url, state);
-        }
-        else {
-            this.history.push(url, state);
+    afterClose() {
+        if (this.config.afterClose) {
+            return this.config.afterClose();
         }
+        return true;
     }
     get tokenData() {
         if (!this._tokenData) {

package/core/route/route.test.js

@@ -29,18 +29,18 @@ describe('route', () => {
     beforeEach(() => {
         history.clearMocks();
     });
-    it('empty string', () => {
+    it('empty string', async () => {
         const route = new Route('');
         expect(route.isOpened).toBe(true);
     });
-    it('/test', () => {
+    it('/test', async () => {
         const route = new Route('/test');
-        route.open();
+        await route.open();
         expect(history.spies.push).toBeCalledWith('/test', null);
     });
-    it('/test/:id/:bar{/:bar3}', () => {
+    it('/test/:id/:bar{/:bar3}', async () => {
         const route = new Route('/test/:id/:bar{/:bar3}');
-        route.open({
+        await route.open({
             id: 1,
             bar: 'barg',
         });
@@ -48,34 +48,34 @@ describe('route', () => {
         expectTypeOf(route.open).toBeFunction();
         expectTypeOf(route.open).parameter(0).toEqualTypeOf();
     });
-    it('/test/*splat', () => {
+    it('/test/*splat', async () => {
         const route = new Route('/test/*splat');
-        route.open({
+        await route.open({
             splat: [1, 2, 3],
         });
         expect(history.spies.push).toBeCalledWith('/test/1/2/3', null);
     });
-    it('/users{/:id}/delete', () => {
+    it('/users{/:id}/delete', async () => {
         const route = new Route('/users{/:id}/delete');
-        route.open({
+        await route.open({
             id: 1,
         });
         expect(history.spies.push).toBeCalledWith('/users/1/delete', null);
         history.clearMocks();
-        route.open();
+        await route.open();
         expect(history.spies.push).toBeCalledWith('/users/delete', null);
         history.clearMocks();
         const childRoute = route.extend('/push/:id1{/:bar}');
-        childRoute.open({
+        await childRoute.open({
             id1: 1,
             bar: 2,
             id: 3,
         });
         expect(history.spies.push).toBeCalledWith('/users/3/delete/push/1/2', null);
     });
-    it('/posts{/:slug}/*rest', () => {
+    it('/posts{/:slug}/*rest', async () => {
         const route = new Route('/posts{/:slug}/*rest');
-        route.open({
+        await route.open({
             slug: true,
             rest: [1, 2, 3, 'bar'],
         });
@@ -94,9 +94,9 @@ describe('route', () => {
             },
         });
     });
-    it('/test/:id/:bar + baseUrl + query params', () => {
+    it('/test/:id/:bar + baseUrl + query params', async () => {
         const route = new Route('/test/:id/:bar', { baseUrl: '/mobx-view-model' });
-        route.open({
+        await route.open({
             id: 1,
             bar: 'barg',
         }, {
@@ -105,9 +105,9 @@ describe('route', () => {
         expect(history.spies.push).toBeCalledWith('/mobx-view-model/test/1/barg?a=1', null);
         expect(route.isOpened).toBe(true);
     });
-    it('/test/:id/:bar + baseUrl + query params + (query params tests)', () => {
+    it('/test/:id/:bar + baseUrl + query params + (query params tests)', async () => {
         const route = new Route('/test/:id/:bar', { baseUrl: '/mobx-view-model' });
-        route.open({
+        await route.open({
             id: 1,
             bar: 'barg',
         }, {
@@ -117,7 +117,7 @@ describe('route', () => {
         expect(location.search).toBe('?a=3&b=1%2C2%2C3');
         expect(route.query.data).toEqual({ a: '3', b: '1,2,3' });
     });
-    it('hierarchy test', () => {
+    it('hierarchy test', async () => {
         const routes = {
             private: new RouteGroup({
                 index: new Route('/', { index: true }),
@@ -145,7 +145,7 @@ describe('route', () => {
         expect(routes.private.isOpened).toBe(true);
         expect(routes.private.routes.matrices.isOpened).toBe(true);
         expect(routes.private.routes.techreview.isOpened).toBe(false);
-        routes.private.routes.index.open();
+        await routes.private.routes.index.open();
         expect(routes.private.isOpened).toBe(true);
         expect(routes.private.routes.index.isOpened).toBe(true);
         expect(routes.private.routes.techreview.isOpened).toBe(false);
@@ -153,7 +153,7 @@ describe('route', () => {
         expect(location.href).toBe('http://localhost:3000/');
         history.clearMocks();
     });
-    it('test with root paths (/, "")', () => {
+    it('test with root paths (/, "")', async () => {
         const routes = {
             home: new Route('/'),
             root: new Route(''),
@@ -169,7 +169,7 @@ describe('route', () => {
         expect(routes.root.isOpened).toBe(true);
         expect(routes.projects.routes.index.isOpened).toBe(false);
     });
-    it('parent test', () => {
+    it('parent test', async () => {
         history.push('/a/b/c', null);
         const routeA = new Route('/a');
         const routeB = routeA.extend('/b');

package/core/route/route.types.d.ts

@@ -1,15 +1,15 @@
 import { ParseOptions } from 'path-to-regexp';
-import { AnyObject } from 'yummies/utils/types';
+import { AnyObject, MaybePromise } from 'yummies/utils/types';
 import { RouteGlobalConfig } from '../config/config.types.js';
 import type { Route } from './route.js';
-export type OpenData = {
+export type PreparedNavigationData<TParams extends AnyObject = AnyObject> = {
     state?: any;
     /**
      * path parameters
      *
      * can be received from extended routes
      */
-    params?: AnyObject;
+    params?: TParams;
     url: string;
     replace?: boolean;
     query?: AnyObject;
@@ -17,14 +17,19 @@ export type OpenData = {
 /**
  * Returning `false` means ignore navigation
  */
-export type BeforeOpenCheckResult = void | boolean | {
+export type BeforeEnterFeedback = void | boolean | {
     url: string;
     state?: any;
     replace?: boolean;
 };
-export type BeforeOpenHandler = (openData: OpenData) => BeforeOpenCheckResult | Promise<BeforeOpenCheckResult>;
-export type RouteOpenedChecker = (data: AnyObject) => boolean;
-export interface RouteConfiguration<TPath extends string, TParentRoute extends AnyRoute | null = null> extends Partial<RouteGlobalConfig> {
+export type AfterLeaveFeedback = void | boolean | {
+    url: string;
+    state?: any;
+    replace?: boolean;
+};
+export type BeforeOpenHandler<TParams extends AnyObject = AnyObject> = (preparedNavigationData: PreparedNavigationData<TParams>) => MaybePromise<BeforeEnterFeedback>;
+export type AfterCloseHandler = () => void;
+export interface RouteConfiguration<TPath extends string, TParams extends AnyObject = ParsedPathParams<TPath>, TParentRoute extends AnyRoute | null = null> extends Partial<RouteGlobalConfig> {
     abortSignal?: AbortSignal;
     index?: boolean;
     hash?: boolean;
@@ -32,12 +37,14 @@ export interface RouteConfiguration<TPath extends string, TParentRoute extends A
     parseOptions?: ParseOptions;
     parent?: TParentRoute;
     children?: AnyRoute[];
-    checkOpened?: RouteOpenedChecker;
-    beforeOpen?: BeforeOpenHandler;
-    onOpen?: (data: RouteMatchesData<TPath>, route: Route<TPath, TParentRoute>) => void;
+    params?: (params: ExtractPathParams<TPath>) => TParams | null | false;
+    checkOpened?: (parsedPathData: ParsedPathData<NoInfer<TPath>>) => boolean;
+    beforeOpen?: BeforeOpenHandler<NoInfer<TParams>>;
+    afterClose?: AfterCloseHandler;
+    onOpen?: (data: ParsedPathData<NoInfer<TPath>>, route: Route<NoInfer<TPath>, NoInfer<TParams>, NoInfer<TParentRoute>>) => void;
     onClose?: () => void;
 }
-export type AnyRoute = Route<string, any>;
+export type AnyRoute = Route<string, AnyObject, any>;
 export type PathParam = string | number | boolean | null;
 export type PathParsedParam = string;
 type Simplify<T> = T extends infer U ? {
@@ -62,7 +69,7 @@ export interface RouteNavigateParams {
     state?: any;
     query?: AnyObject;
 }
-export interface RouteMatchesData<TPath extends string> {
+export interface ParsedPathData<TPath extends string> {
     path: string;
     params: ParsedPathParams<TPath>;
 }

package/core/route/route.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.types.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.types.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-route",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "keywords": [
     "mobx",
     "react",
@@ -26,7 +26,7 @@
     "mobx-location-history": "^6.1.0",
     "path-to-regexp": "^8.2.0",
     "react-simple-loadable": "^2.1.0",
-    "yummies": "^3.2.8"
+    "yummies": "^3.2.10"
   },
   "peerDependencies": {
     "@types/react": "^18.3.20",
@@ -58,7 +58,7 @@
     "commitfmt": "^1.0.0",
     "eslint": "^8.57.1",
     "js2me-eslint-config": "^1.0.7",
-    "js2me-exports-post-build-script": "^2.0.18",
+    "js2me-exports-post-build-script": "^3.0.2",
     "jsdom": "^26.1.0",
     "lefthook": "^1.11.13",
     "nodemon": "^3.1.9",

package/view-model/route-view-model.d.ts

@@ -6,7 +6,7 @@ export declare abstract class RouteViewModel<TRoute extends AnyRouteEntity = Any
     constructor(params: ViewModelParams<any, any>);
     get payload(): TRoute extends Route<string, any> ? ParsedPathParams<TRoute['path']> : TRoute extends VirtualRoute<infer Params> ? Params : EmptyObject;
     get query(): import("mobx-location-history").IQueryParams;
-    get pathParams(): TRoute extends Route<string, any> ? ParsedPathParams<TRoute["path"]> : TRoute extends VirtualRoute<infer Params extends AnyObject | EmptyObject> ? Params : EmptyObject;
+    get pathParams(): TRoute extends Route<string, any, null> ? ParsedPathParams<TRoute["path"]> : TRoute extends VirtualRoute<infer Params extends AnyObject | EmptyObject> ? Params : EmptyObject;
     get isMounted(): boolean;
 }
 //# sourceMappingURL=route-view-model.d.ts.map

package/view-model/route-view-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-view-model.d.ts","sourceRoot":"","sources":["../../src/view-model/route-view-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAEL,KAAK,EACL,gBAAgB,EAChB,cAAc,EACd,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,8BAAsB,cAAc,CAClC,MAAM,SAAS,cAAc,GAAG,cAAc,CAC9C,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAEpB,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;IAS7C,IAAa,OAAO,IAAI,MAAM,SAAS,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,GACrD,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAChC,MAAM,SAAS,YAAY,CAAC,MAAM,MAAM,CAAC,GACvC,MAAM,GACN,WAAW,CAUhB;IAED,IAAI,KAAK,iDAMR;IAED,IAAI,UAAU,6GAtBwB,MAAM,yDAwB3C;IAED,IAAI,SAAS,YAEZ;CACF"}
+{"version":3,"file":"route-view-model.d.ts","sourceRoot":"","sources":["../../src/view-model/route-view-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAEL,KAAK,EACL,gBAAgB,EAChB,cAAc,EACd,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,8BAAsB,cAAc,CAClC,MAAM,SAAS,cAAc,GAAG,cAAc,CAC9C,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAEpB,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;IAS7C,IAAa,OAAO,IAAI,MAAM,SAAS,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,GACrD,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAChC,MAAM,SAAS,YAAY,CAAC,MAAM,MAAM,CAAC,GACvC,MAAM,GACN,WAAW,CAUhB;IAED,IAAI,KAAK,iDAMR;IAED,IAAI,UAAU,mHAtBwB,MAAM,yDAwB3C;IAED,IAAI,SAAS,YAEZ;CACF"}