@webiny/app 6.1.0 → 6.2.0

package/features/mainGraphQLClient/MainGraphQLClient.js

@@ -0,0 +1,23 @@
+import { createImplementation } from "@webiny/di";
+import { MainGraphQLClient } from "./abstractions.js";
+import { GraphQLClient } from "../graphqlClient/abstractions.js";
+import { EnvConfig } from "../envConfig/index.js";
+class MainGraphQLClientImpl {
+  constructor(envConfig, client) {
+    this.client = client;
+    this.endpoint = envConfig.get("graphqlApiUrl");
+  }
+  async execute(params) {
+    return this.client.execute({
+      endpoint: this.endpoint,
+      ...params
+    });
+  }
+}
+export const DefaultMainGraphQLClient = createImplementation({
+  abstraction: MainGraphQLClient,
+  implementation: MainGraphQLClientImpl,
+  dependencies: [EnvConfig, GraphQLClient]
+});
+
+//# sourceMappingURL=MainGraphQLClient.js.map

package/features/mainGraphQLClient/MainGraphQLClient.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createImplementation","MainGraphQLClient","GraphQLClient","EnvConfig","MainGraphQLClientImpl","constructor","envConfig","client","endpoint","get","execute","params","DefaultMainGraphQLClient","abstraction","implementation","dependencies"],"sources":["MainGraphQLClient.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { MainGraphQLClient } from \"./abstractions.js\";\nimport { GraphQLClient } from \"~/features/graphqlClient/abstractions.js\";\nimport { EnvConfig } from \"~/features/envConfig/index.js\";\n\nclass MainGraphQLClientImpl implements MainGraphQLClient.Interface {\n    private readonly endpoint: string;\n\n    constructor(\n        envConfig: EnvConfig.Interface,\n        private client: GraphQLClient.Interface\n    ) {\n        this.endpoint = envConfig.get(\"graphqlApiUrl\");\n    }\n\n    async execute<TResult = any, TVariables = any>(\n        params: MainGraphQLClient.Request<TVariables>\n    ): Promise<TResult> {\n        return this.client.execute({ endpoint: this.endpoint, ...params });\n    }\n}\n\nexport const DefaultMainGraphQLClient = createImplementation({\n    abstraction: MainGraphQLClient,\n    implementation: MainGraphQLClientImpl,\n    dependencies: [EnvConfig, GraphQLClient]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,iBAAiB;AAC1B,SAASC,aAAa;AACtB,SAASC,SAAS;AAElB,MAAMC,qBAAqB,CAAwC;EAG/DC,WAAWA,CACPC,SAA8B,EACtBC,MAA+B,EACzC;IAAA,KADUA,MAA+B,GAA/BA,MAA+B;IAEvC,IAAI,CAACC,QAAQ,GAAGF,SAAS,CAACG,GAAG,CAAC,eAAe,CAAC;EAClD;EAEA,MAAMC,OAAOA,CACTC,MAA6C,EAC7B;IAChB,OAAO,IAAI,CAACJ,MAAM,CAACG,OAAO,CAAC;MAAEF,QAAQ,EAAE,IAAI,CAACA,QAAQ;MAAE,GAAGG;IAAO,CAAC,CAAC;EACtE;AACJ;AAEA,OAAO,MAAMC,wBAAwB,GAAGZ,oBAAoB,CAAC;EACzDa,WAAW,EAAEZ,iBAAiB;EAC9Ba,cAAc,EAAEV,qBAAqB;EACrCW,YAAY,EAAE,CAACZ,SAAS,EAAED,aAAa;AAC3C,CAAC,CAAC","ignoreList":[]}

package/features/mainGraphQLClient/abstractions.d.ts

@@ -0,0 +1,17 @@
+import type { DocumentNode } from "graphql";
+type IHeaders = Record<string, string | number | undefined>;
+type MainGraphQLRequest<TVariables = any> = {
+    query: DocumentNode | string;
+    variables?: TVariables;
+    headers?: IHeaders;
+};
+export interface IMainGraphQLClient {
+    execute<TResult = any, TVariables = any>(params: MainGraphQLRequest<TVariables>): Promise<TResult>;
+}
+export declare const MainGraphQLClient: import("@webiny/di").Abstraction<IMainGraphQLClient>;
+export declare namespace MainGraphQLClient {
+    type Headers = IHeaders;
+    type Interface = IMainGraphQLClient;
+    type Request<TVariables = any> = MainGraphQLRequest<TVariables>;
+}
+export {};

package/features/mainGraphQLClient/abstractions.js

@@ -0,0 +1,4 @@
+import { createAbstraction } from "@webiny/feature/admin";
+export const MainGraphQLClient = createAbstraction("MainGraphQLClient");
+
+//# sourceMappingURL=abstractions.js.map

package/features/mainGraphQLClient/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createAbstraction","MainGraphQLClient"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { DocumentNode } from \"graphql\";\n\ntype IHeaders = Record<string, string | number | undefined>;\n\ntype MainGraphQLRequest<TVariables = any> = {\n    query: DocumentNode | string;\n    variables?: TVariables;\n    headers?: IHeaders;\n};\n\nexport interface IMainGraphQLClient {\n    execute<TResult = any, TVariables = any>(\n        params: MainGraphQLRequest<TVariables>\n    ): Promise<TResult>;\n}\n\nexport const MainGraphQLClient = createAbstraction<IMainGraphQLClient>(\"MainGraphQLClient\");\n\nexport namespace MainGraphQLClient {\n    export type Headers = IHeaders;\n    export type Interface = IMainGraphQLClient;\n    export type Request<TVariables = any> = MainGraphQLRequest<TVariables>;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,uBAAuB;AAiBzD,OAAO,MAAMC,iBAAiB,GAAGD,iBAAiB,CAAqB,mBAAmB,CAAC","ignoreList":[]}

package/features/mainGraphQLClient/feature.d.ts

@@ -0,0 +1,3 @@
+export declare const MainGraphQLClientFeature: import("~/shared/di/createFeature.js").FeatureDefinition<{
+    client: import("./abstractions.js").IMainGraphQLClient;
+}, []>;

package/features/mainGraphQLClient/feature.js

@@ -0,0 +1,16 @@
+import { MainGraphQLClient } from "./abstractions.js";
+import { DefaultMainGraphQLClient } from "./MainGraphQLClient.js";
+import { createFeature } from "../../shared/di/createFeature.js";
+export const MainGraphQLClientFeature = createFeature({
+  name: "MainGraphQLClient",
+  register(container) {
+    container.register(DefaultMainGraphQLClient).inSingletonScope();
+  },
+  resolve(container) {
+    return {
+      client: container.resolve(MainGraphQLClient)
+    };
+  }
+});
+
+//# sourceMappingURL=feature.js.map

package/features/mainGraphQLClient/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MainGraphQLClient","DefaultMainGraphQLClient","createFeature","MainGraphQLClientFeature","name","register","container","inSingletonScope","resolve","client"],"sources":["feature.ts"],"sourcesContent":["import { MainGraphQLClient } from \"./abstractions.js\";\nimport { DefaultMainGraphQLClient } from \"./MainGraphQLClient.js\";\nimport { createFeature } from \"~/shared/di/createFeature.js\";\n\nexport const MainGraphQLClientFeature = createFeature({\n    name: \"MainGraphQLClient\",\n    register(container) {\n        container.register(DefaultMainGraphQLClient).inSingletonScope();\n    },\n    resolve(container) {\n        return {\n            client: container.resolve(MainGraphQLClient)\n        };\n    }\n});\n"],"mappings":"AAAA,SAASA,iBAAiB;AAC1B,SAASC,wBAAwB;AACjC,SAASC,aAAa;AAEtB,OAAO,MAAMC,wBAAwB,GAAGD,aAAa,CAAC;EAClDE,IAAI,EAAE,mBAAmB;EACzBC,QAAQA,CAACC,SAAS,EAAE;IAChBA,SAAS,CAACD,QAAQ,CAACJ,wBAAwB,CAAC,CAACM,gBAAgB,CAAC,CAAC;EACnE,CAAC;EACDC,OAAOA,CAACF,SAAS,EAAE;IACf,OAAO;MACHG,MAAM,EAAEH,SAAS,CAACE,OAAO,CAACR,iBAAiB;IAC/C,CAAC;EACL;AACJ,CAAC,CAAC","ignoreList":[]}

package/features/mainGraphQLClient/index.d.ts

@@ -0,0 +1 @@
+export { MainGraphQLClient } from "./abstractions.js";

package/features/mainGraphQLClient/index.js

@@ -0,0 +1,3 @@
+export { MainGraphQLClient } from "./abstractions.js";
+
+//# sourceMappingURL=index.js.map

package/features/mainGraphQLClient/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MainGraphQLClient"],"sources":["index.ts"],"sourcesContent":["export { MainGraphQLClient } from \"./abstractions.js\";\n"],"mappings":"AAAA,SAASA,iBAAiB","ignoreList":[]}

package/features/router/HistoryRouterGateway.d.ts

@@ -1,20 +1,22 @@
 import type { z } from "zod";
 import type { History } from "history";
-import type { RouteDefinition, OnRouteExit } from "./abstractions.js";
+import type { RouteDefinition, RouteTransitionGuardConfig, GuardDisposer } from "./abstractions.js";
 import { RouterGateway } from "./abstractions.js";
 export declare class HistoryRouterGateway implements RouterGateway.Interface {
     private readonly history;
     private readonly router;
     private stopListening;
     private unblock;
-    private onRouteExitCb;
+    private guards;
     constructor(history: History, baseUrl: string);
-    onRouteExit(cb: OnRouteExit): void;
+    addGuard(config: RouteTransitionGuardConfig): GuardDisposer;
     goToRoute(name: string, params: z.ZodTypeAny): void;
     setRoutes(routes: RouteDefinition[]): void;
     destroy(): void;
     pushState(url: string): void;
     private resolvePathname;
+    private findBlockingGuard;
     private installBlocker;
+    private removeBlocker;
     private removeBlockerAndRetry;
 }

package/features/router/HistoryRouterGateway.js

@@ -1,6 +1,7 @@
 import { RouteUrl } from "./RouteUrl.js";
 import { Router } from "./Router.js";
 export class HistoryRouterGateway {
+  guards = new Set();
   constructor(history, baseUrl) {
     this.history = history;
     this.router = new Router(baseUrl);
@@ -11,9 +12,18 @@ export class HistoryRouterGateway {
       this.resolvePathname(location.pathname, queryParams);
     });
   }
-  onRouteExit(cb) {
-    this.onRouteExitCb = cb;
-    this.installBlocker();
+  addGuard(config) {
+    const hadGuards = this.guards.size > 0;
+    this.guards.add(config);
+    if (!hadGuards) {
+      this.installBlocker();
+    }
+    return () => {
+      this.guards.delete(config);
+      if (this.guards.size === 0) {
+        this.removeBlocker();
+      }
+    };
   }
   goToRoute(name, params) {
     const route = this.router.findRoute(name);
@@ -32,11 +42,8 @@ export class HistoryRouterGateway {
   }
   destroy() {
     this.stopListening();
-    if (this.unblock) {
-      this.unblock();
-      this.unblock = undefined;
-    }
-    this.onRouteExitCb = undefined;
+    this.removeBlocker();
+    this.guards.clear();
   }
   pushState(url) {
     this.history.push(url);
@@ -52,47 +59,57 @@ export class HistoryRouterGateway {
     } = result;
     onMatch(matchedRoute);
   }
+  findBlockingGuard() {
+    for (const config of this.guards) {
+      if (config.guard()) {
+        return config;
+      }
+    }
+    return undefined;
+  }
   installBlocker() {
     if (this.unblock) {
       this.unblock();
     }
     this.unblock = this.history.block(tx => {
-      const onRouteExit = this.onRouteExitCb;
-      if (!onRouteExit) {
-        this.removeBlockerAndRetry(tx);
-        return;
-      }
-      let resolved = false;
-      onRouteExit({
-        continue: () => {
-          if (!resolved) {
+      const blockingGuard = this.findBlockingGuard();
+      if (blockingGuard) {
+        let resolved = false;
+        blockingGuard.onBlocked({
+          continue: () => {
+            if (!resolved) {
+              resolved = true;
+              this.removeBlockerAndRetry(tx);
+            }
+          },
+          cancel: () => {
             resolved = true;
-            this.removeBlockerAndRetry(tx);
+            // Do nothing — history v5 already reverted the URL.
           }
-        },
-        cancel: () => {
-          resolved = true;
-          // Do nothing — history v5 already reverted the URL.
-        }
-      });
+        });
+      } else {
+        this.removeBlockerAndRetry(tx);
+      }
     });
   }
-  removeBlockerAndRetry(tx) {
-    // We must remove the blocker before retrying because history v5's
-    // allowTx() always returns false when any blocker is registered.
+  removeBlocker() {
     if (this.unblock) {
       this.unblock();
       this.unblock = undefined;
     }
+  }
+  removeBlockerAndRetry(tx) {
+    // We must remove the blocker before retrying because history v5's
+    // allowTx() always returns false when any blocker is registered.
+    this.removeBlocker();
 
     // Listen for the next navigation to complete, then reinstall the
-    // blocker. This avoids the race condition where setTimeout-based
-    // reinstallation fires before an async popstate (back/forward)
-    // has settled, causing the blocker to catch its own retried
-    // navigation in an infinite loop.
+    // blocker only if guards are still active.
     const unlisten = this.history.listen(() => {
       unlisten();
-      this.installBlocker();
+      if (this.guards.size > 0) {
+        this.installBlocker();
+      }
     });
     tx.retry();
   }

package/features/router/HistoryRouterGateway.js.map

@@ -1 +1 @@
-{"version":3,"names":["RouteUrl","Router","HistoryRouterGateway","constructor","history","baseUrl","router","stopListening","listen","location","queryParams","Object","fromEntries","URLSearchParams","search","entries","resolvePathname","pathname","onRouteExit","cb","onRouteExitCb","installBlocker","goToRoute","name","params","route","findRoute","console","warn","getBaseUrl","push","fromPattern","path","setRoutes","routes","currentPathname","destroy","unblock","undefined","pushState","url","result","resolve","matchedRoute","onMatch","block","tx","removeBlockerAndRetry","resolved","continue","cancel","unlisten","retry"],"sources":["HistoryRouterGateway.ts"],"sourcesContent":["import type { z } from \"zod\";\nimport type { History } from \"history\";\nimport type { RouteDefinition, OnRouteExit } from \"./abstractions.js\";\nimport { RouterGateway } from \"./abstractions.js\";\nimport { RouteUrl } from \"./RouteUrl.js\";\nimport { Router } from \"./Router.js\";\n\nexport class HistoryRouterGateway implements RouterGateway.Interface {\n    private readonly history: History;\n    private readonly router: Router;\n    private stopListening: () => void;\n    private unblock: (() => void) | undefined;\n    private onRouteExitCb: OnRouteExit | undefined;\n\n    constructor(history: History, baseUrl: string) {\n        this.history = history;\n        this.router = new Router(baseUrl);\n\n        this.stopListening = history.listen(async ({ location }) => {\n            const queryParams = Object.fromEntries(new URLSearchParams(location.search).entries());\n            this.resolvePathname(location.pathname, queryParams);\n        });\n    }\n\n    onRouteExit(cb: OnRouteExit): void {\n        this.onRouteExitCb = cb;\n        this.installBlocker();\n    }\n\n    goToRoute(name: string, params: z.ZodTypeAny): void {\n        const route = this.router.findRoute(name);\n        if (!route) {\n            console.warn(`Route \"${name}\" not found.`);\n            return;\n        }\n\n        const baseUrl = this.router.getBaseUrl();\n        this.history.push(RouteUrl.fromPattern(route.path, params, baseUrl));\n    }\n\n    setRoutes(routes: RouteDefinition[]) {\n        this.router.setRoutes(routes);\n\n        const queryParams = Object.fromEntries(\n            new URLSearchParams(this.history.location.search).entries()\n        );\n        const currentPathname = this.history.location.pathname;\n        this.resolvePathname(currentPathname, queryParams);\n    }\n\n    destroy(): void {\n        this.stopListening();\n        if (this.unblock) {\n            this.unblock();\n            this.unblock = undefined;\n        }\n        this.onRouteExitCb = undefined;\n    }\n\n    pushState(url: string): void {\n        this.history.push(url);\n    }\n\n    private async resolvePathname(pathname: string, queryParams?: Record<string, unknown>) {\n        const result = this.router.resolve(pathname, queryParams);\n        if (!result) {\n            return;\n        }\n\n        const { matchedRoute, onMatch } = result;\n\n        onMatch(matchedRoute);\n    }\n\n    private installBlocker(): void {\n        if (this.unblock) {\n            this.unblock();\n        }\n\n        this.unblock = this.history.block(tx => {\n            const onRouteExit = this.onRouteExitCb;\n            if (!onRouteExit) {\n                this.removeBlockerAndRetry(tx);\n                return;\n            }\n\n            let resolved = false;\n\n            onRouteExit({\n                continue: () => {\n                    if (!resolved) {\n                        resolved = true;\n                        this.removeBlockerAndRetry(tx);\n                    }\n                },\n                cancel: () => {\n                    resolved = true;\n                    // Do nothing — history v5 already reverted the URL.\n                }\n            });\n        });\n    }\n\n    private removeBlockerAndRetry(tx: { retry: () => void }): void {\n        // We must remove the blocker before retrying because history v5's\n        // allowTx() always returns false when any blocker is registered.\n        if (this.unblock) {\n            this.unblock();\n            this.unblock = undefined;\n        }\n\n        // Listen for the next navigation to complete, then reinstall the\n        // blocker. This avoids the race condition where setTimeout-based\n        // reinstallation fires before an async popstate (back/forward)\n        // has settled, causing the blocker to catch its own retried\n        // navigation in an infinite loop.\n        const unlisten = this.history.listen(() => {\n            unlisten();\n            this.installBlocker();\n        });\n\n        tx.retry();\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["RouteUrl","Router","HistoryRouterGateway","guards","Set","constructor","history","baseUrl","router","stopListening","listen","location","queryParams","Object","fromEntries","URLSearchParams","search","entries","resolvePathname","pathname","addGuard","config","hadGuards","size","add","installBlocker","delete","removeBlocker","goToRoute","name","params","route","findRoute","console","warn","getBaseUrl","push","fromPattern","path","setRoutes","routes","currentPathname","destroy","clear","pushState","url","result","resolve","matchedRoute","onMatch","findBlockingGuard","guard","undefined","unblock","block","tx","blockingGuard","resolved","onBlocked","continue","removeBlockerAndRetry","cancel","unlisten","retry"],"sources":["HistoryRouterGateway.ts"],"sourcesContent":["import type { z } from \"zod\";\nimport type { History } from \"history\";\nimport type { RouteDefinition, RouteTransitionGuardConfig, GuardDisposer } from \"./abstractions.js\";\nimport { RouterGateway } from \"./abstractions.js\";\nimport { RouteUrl } from \"./RouteUrl.js\";\nimport { Router } from \"./Router.js\";\n\nexport class HistoryRouterGateway implements RouterGateway.Interface {\n    private readonly history: History;\n    private readonly router: Router;\n    private stopListening: () => void;\n    private unblock: (() => void) | undefined;\n    private guards = new Set<RouteTransitionGuardConfig>();\n\n    constructor(history: History, baseUrl: string) {\n        this.history = history;\n        this.router = new Router(baseUrl);\n\n        this.stopListening = history.listen(async ({ location }) => {\n            const queryParams = Object.fromEntries(new URLSearchParams(location.search).entries());\n            this.resolvePathname(location.pathname, queryParams);\n        });\n    }\n\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer {\n        const hadGuards = this.guards.size > 0;\n        this.guards.add(config);\n        if (!hadGuards) {\n            this.installBlocker();\n        }\n        return () => {\n            this.guards.delete(config);\n            if (this.guards.size === 0) {\n                this.removeBlocker();\n            }\n        };\n    }\n\n    goToRoute(name: string, params: z.ZodTypeAny): void {\n        const route = this.router.findRoute(name);\n        if (!route) {\n            console.warn(`Route \"${name}\" not found.`);\n            return;\n        }\n\n        const baseUrl = this.router.getBaseUrl();\n        this.history.push(RouteUrl.fromPattern(route.path, params, baseUrl));\n    }\n\n    setRoutes(routes: RouteDefinition[]) {\n        this.router.setRoutes(routes);\n\n        const queryParams = Object.fromEntries(\n            new URLSearchParams(this.history.location.search).entries()\n        );\n        const currentPathname = this.history.location.pathname;\n        this.resolvePathname(currentPathname, queryParams);\n    }\n\n    destroy(): void {\n        this.stopListening();\n        this.removeBlocker();\n        this.guards.clear();\n    }\n\n    pushState(url: string): void {\n        this.history.push(url);\n    }\n\n    private async resolvePathname(pathname: string, queryParams?: Record<string, unknown>) {\n        const result = this.router.resolve(pathname, queryParams);\n        if (!result) {\n            return;\n        }\n\n        const { matchedRoute, onMatch } = result;\n\n        onMatch(matchedRoute);\n    }\n\n    private findBlockingGuard(): RouteTransitionGuardConfig | undefined {\n        for (const config of this.guards) {\n            if (config.guard()) {\n                return config;\n            }\n        }\n        return undefined;\n    }\n\n    private installBlocker(): void {\n        if (this.unblock) {\n            this.unblock();\n        }\n\n        this.unblock = this.history.block(tx => {\n            const blockingGuard = this.findBlockingGuard();\n            if (blockingGuard) {\n                let resolved = false;\n\n                blockingGuard.onBlocked({\n                    continue: () => {\n                        if (!resolved) {\n                            resolved = true;\n                            this.removeBlockerAndRetry(tx);\n                        }\n                    },\n                    cancel: () => {\n                        resolved = true;\n                        // Do nothing — history v5 already reverted the URL.\n                    }\n                });\n            } else {\n                this.removeBlockerAndRetry(tx);\n            }\n        });\n    }\n\n    private removeBlocker(): void {\n        if (this.unblock) {\n            this.unblock();\n            this.unblock = undefined;\n        }\n    }\n\n    private removeBlockerAndRetry(tx: { retry: () => void }): void {\n        // We must remove the blocker before retrying because history v5's\n        // allowTx() always returns false when any blocker is registered.\n        this.removeBlocker();\n\n        // Listen for the next navigation to complete, then reinstall the\n        // blocker only if guards are still active.\n        const unlisten = this.history.listen(() => {\n            unlisten();\n            if (this.guards.size > 0) {\n                this.installBlocker();\n            }\n        });\n\n        tx.retry();\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/features/router/RouterRepository.d.ts

@@ -5,9 +5,9 @@ declare class RouterRepositoryImpl implements Abstractions.RouterRepository.Inte
     private gateway;
     private currentRoute;
     private routes;
-    private guards;
     private pendingTransition;
     private forceUnblocked;
+    private guardDisposers;
     constructor(gateway: Abstractions.RouterGateway.Interface);
     getMatchedRoute(): MatchedRoute<Record<string, any>> | undefined;
     getCurrentRoute(): Route<any> | undefined;
@@ -20,11 +20,11 @@ declare class RouterRepositoryImpl implements Abstractions.RouterRepository.Inte
     confirmTransition(): void;
     cancelTransition(): void;
     destroy(): void;
-    private installBlocker;
-    private findBlockingGuard;
     private routeWithAction;
     private transitionToRoute;
     private getRouteByName;
 }
-export declare const RouterRepository: import("@webiny/di").Implementation<typeof RouterRepositoryImpl>;
+export declare const RouterRepository: typeof RouterRepositoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<Abstractions.IRouterRepository>;
+};
 export {};

package/features/router/RouterRepository.js

@@ -1,6 +1,5 @@
 import { makeAutoObservable, runInAction } from "mobx";
 import * as Abstractions from "./abstractions.js";
-import { createImplementation } from "@webiny/di";
 import { RouteUrl } from "./RouteUrl.js";
 const INIT_ROUTE = {
   name: "__init__",
@@ -11,13 +10,11 @@ const INIT_ROUTE = {
 class RouterRepositoryImpl {
   currentRoute = INIT_ROUTE;
   routes = [];
-  guards = new Set();
   forceUnblocked = false;
+  guardDisposers = new Map();
   constructor(gateway) {
     this.gateway = gateway;
-    this.installBlocker();
     makeAutoObservable(this, {
-      guards: false,
       pendingTransition: false,
       forceUnblocked: false
     });
@@ -40,13 +37,29 @@ class RouterRepositoryImpl {
     this.gateway.goToRoute(route.name, params);
   }
   addGuard(config) {
-    this.guards.add(config);
-    return () => {
-      this.guards.delete(config);
+    const gatewayGuard = {
+      guard: () => {
+        if (this.forceUnblocked) {
+          this.forceUnblocked = false;
+          return false;
+        }
+        return config.guard();
+      },
+      onBlocked: controller => {
+        this.pendingTransition = controller;
+        config.onBlocked(controller);
+      }
+    };
+    const disposeGatewayGuard = this.gateway.addGuard(gatewayGuard);
+    const dispose = () => {
+      this.guardDisposers.delete(config);
+      disposeGatewayGuard();
     };
+    this.guardDisposers.set(config, dispose);
+    return dispose;
   }
   isBlocked() {
-    return this.findBlockingGuard() !== undefined;
+    return this.pendingTransition !== undefined;
   }
   unblock() {
     this.forceUnblocked = true;
@@ -80,30 +93,6 @@ class RouterRepositoryImpl {
   destroy() {
     this.gateway.destroy();
   }
-  installBlocker() {
-    this.gateway.onRouteExit(controller => {
-      if (this.forceUnblocked) {
-        this.forceUnblocked = false;
-        controller.continue();
-        return;
-      }
-      const blockingGuard = this.findBlockingGuard();
-      if (blockingGuard) {
-        this.pendingTransition = controller;
-        blockingGuard.onBlocked();
-      } else {
-        controller.continue();
-      }
-    });
-  }
-  findBlockingGuard() {
-    for (const config of this.guards) {
-      if (config.guard()) {
-        return config;
-      }
-    }
-    return undefined;
-  }
   routeWithAction = route => {
     return {
       name: route.name,
@@ -128,9 +117,8 @@ class RouterRepositoryImpl {
     return this.routes.find(existingRoute => existingRoute.name === name);
   }
 }
-export const RouterRepository = createImplementation({
+export const RouterRepository = Abstractions.RouterRepository.createImplementation({
   implementation: RouterRepositoryImpl,
-  abstraction: Abstractions.RouterRepository,
   dependencies: [Abstractions.RouterGateway]
 });
 

package/features/router/RouterRepository.js.map

@@ -1 +1 @@
-{"version":3,"names":["makeAutoObservable","runInAction","Abstractions","createImplementation","RouteUrl","INIT_ROUTE","name","path","pathname","params","RouterRepositoryImpl","currentRoute","routes","guards","Set","forceUnblocked","constructor","gateway","installBlocker","pendingTransition","getMatchedRoute","undefined","getCurrentRoute","find","route","registerRoutes","routesWithAction","map","routeWithAction","setRoutes","getLink","fromPattern","goToRoute","addGuard","config","add","delete","isBlocked","findBlockingGuard","unblock","tx","continue","setTimeout","confirmTransition","cancelTransition","cancel","destroy","onRouteExit","controller","blockingGuard","onBlocked","guard","onMatch","transitionToRoute","bind","matchedRoute","getRouteByName","parse","Object","assign","existingRoute","RouterRepository","implementation","abstraction","dependencies","RouterGateway"],"sources":["RouterRepository.ts"],"sourcesContent":["import { makeAutoObservable, runInAction } from \"mobx\";\nimport type {\n    MatchedRoute,\n    RouteDefinition,\n    RouteTransitionGuardConfig,\n    GuardDisposer,\n    TransitionController\n} from \"./abstractions.js\";\nimport * as Abstractions from \"./abstractions.js\";\nimport { Route, RouteParamsDefinition, RouteParamsInfer } from \"./Route.js\";\nimport { createImplementation } from \"@webiny/di\";\nimport { RouteUrl } from \"./RouteUrl.js\";\n\nconst INIT_ROUTE = { name: \"__init__\", path: \"\", pathname: \"\", params: {} };\n\nclass RouterRepositoryImpl implements Abstractions.RouterRepository.Interface {\n    private gateway: Abstractions.RouterGateway.Interface;\n    private currentRoute: MatchedRoute = INIT_ROUTE;\n    private routes: Route<any>[] = [];\n    private guards = new Set<RouteTransitionGuardConfig>();\n    private pendingTransition: TransitionController | undefined;\n    private forceUnblocked = false;\n\n    constructor(gateway: Abstractions.RouterGateway.Interface) {\n        this.gateway = gateway;\n        this.installBlocker();\n\n        makeAutoObservable(this, {\n            guards: false,\n            pendingTransition: false,\n            forceUnblocked: false\n        } as any);\n    }\n\n    getMatchedRoute() {\n        return this.currentRoute.name !== INIT_ROUTE.name ? this.currentRoute : undefined;\n    }\n\n    getCurrentRoute(): Route<any> | undefined {\n        return this.routes.find(route => route.name === this.currentRoute.name);\n    }\n\n    registerRoutes = (routes: Route[]) => {\n        this.routes = routes;\n        const routesWithAction = routes.map<RouteDefinition>(this.routeWithAction);\n\n        this.gateway.setRoutes(routesWithAction);\n    };\n\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params?: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): string {\n        return RouteUrl.fromPattern(route.path, params);\n    }\n\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): void {\n        this.gateway.goToRoute(route.name, params);\n    }\n\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer {\n        this.guards.add(config);\n        return () => {\n            this.guards.delete(config);\n        };\n    }\n\n    isBlocked(): boolean {\n        return this.findBlockingGuard() !== undefined;\n    }\n\n    unblock(): void {\n        this.forceUnblocked = true;\n        if (this.pendingTransition) {\n            this.forceUnblocked = false;\n            const tx = this.pendingTransition;\n            this.pendingTransition = undefined;\n            tx.continue();\n        } else {\n            // No pending transition — expire the flag after the current\n            // call stack so it only covers synchronous navigations that\n            // follow immediately (e.g. router.goToRoute on the next line).\n            setTimeout(() => {\n                this.forceUnblocked = false;\n            }, 0);\n        }\n    }\n\n    confirmTransition(): void {\n        const tx = this.pendingTransition;\n        this.pendingTransition = undefined;\n        if (tx) {\n            tx.continue();\n        }\n    }\n\n    cancelTransition(): void {\n        if (this.pendingTransition) {\n            this.pendingTransition.cancel();\n            this.pendingTransition = undefined;\n        }\n    }\n\n    destroy() {\n        this.gateway.destroy();\n    }\n\n    private installBlocker(): void {\n        this.gateway.onRouteExit(controller => {\n            if (this.forceUnblocked) {\n                this.forceUnblocked = false;\n                controller.continue();\n                return;\n            }\n\n            const blockingGuard = this.findBlockingGuard();\n            if (blockingGuard) {\n                this.pendingTransition = controller;\n                blockingGuard.onBlocked();\n            } else {\n                controller.continue();\n            }\n        });\n    }\n\n    private findBlockingGuard(): RouteTransitionGuardConfig | undefined {\n        for (const config of this.guards) {\n            if (config.guard()) {\n                return config;\n            }\n        }\n        return undefined;\n    }\n\n    private routeWithAction = (route: Route<any>) => {\n        return {\n            name: route.name,\n            path: route.path,\n            onMatch: this.transitionToRoute.bind(this)\n        };\n    };\n\n    private async transitionToRoute(matchedRoute: MatchedRoute) {\n        const route = this.getRouteByName(matchedRoute.name);\n        if (!route) {\n            return;\n        }\n\n        const params =\n            typeof route.params?.parse === \"function\"\n                ? route.params.parse(matchedRoute.params)\n                : matchedRoute.params;\n\n        runInAction(() => {\n            Object.assign(this.currentRoute, {\n                ...matchedRoute,\n                params\n            });\n        });\n    }\n\n    private getRouteByName(name: string) {\n        return this.routes.find(existingRoute => existingRoute.name === name);\n    }\n}\n\nexport const RouterRepository = createImplementation({\n    implementation: RouterRepositoryImpl,\n    abstraction: Abstractions.RouterRepository,\n    dependencies: [Abstractions.RouterGateway]\n});\n"],"mappings":"AAAA,SAASA,kBAAkB,EAAEC,WAAW,QAAQ,MAAM;AAQtD,OAAO,KAAKC,YAAY;AAExB,SAASC,oBAAoB,QAAQ,YAAY;AACjD,SAASC,QAAQ;AAEjB,MAAMC,UAAU,GAAG;EAAEC,IAAI,EAAE,UAAU;EAAEC,IAAI,EAAE,EAAE;EAAEC,QAAQ,EAAE,EAAE;EAAEC,MAAM,EAAE,CAAC;AAAE,CAAC;AAE3E,MAAMC,oBAAoB,CAAoD;EAElEC,YAAY,GAAiBN,UAAU;EACvCO,MAAM,GAAiB,EAAE;EACzBC,MAAM,GAAG,IAAIC,GAAG,CAA6B,CAAC;EAE9CC,cAAc,GAAG,KAAK;EAE9BC,WAAWA,CAACC,OAA6C,EAAE;IACvD,IAAI,CAACA,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,cAAc,CAAC,CAAC;IAErBlB,kBAAkB,CAAC,IAAI,EAAE;MACrBa,MAAM,EAAE,KAAK;MACbM,iBAAiB,EAAE,KAAK;MACxBJ,cAAc,EAAE;IACpB,CAAQ,CAAC;EACb;EAEAK,eAAeA,CAAA,EAAG;IACd,OAAO,IAAI,CAACT,YAAY,CAACL,IAAI,KAAKD,UAAU,CAACC,IAAI,GAAG,IAAI,CAACK,YAAY,GAAGU,SAAS;EACrF;EAEAC,eAAeA,CAAA,EAA2B;IACtC,OAAO,IAAI,CAACV,MAAM,CAACW,IAAI,CAACC,KAAK,IAAIA,KAAK,CAAClB,IAAI,KAAK,IAAI,CAACK,YAAY,CAACL,IAAI,CAAC;EAC3E;EAEAmB,cAAc,GAAIb,MAAe,IAAK;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;IACpB,MAAMc,gBAAgB,GAAGd,MAAM,CAACe,GAAG,CAAkB,IAAI,CAACC,eAAe,CAAC;IAE1E,IAAI,CAACX,OAAO,CAACY,SAAS,CAACH,gBAAgB,CAAC;EAC5C,CAAC;EAEDI,OAAOA,CACHN,KAAqB,EACrBf,MAAsF,EAChF;IACN,OAAOL,QAAQ,CAAC2B,WAAW,CAACP,KAAK,CAACjB,IAAI,EAAEE,MAAM,CAAC;EACnD;EAEAuB,SAASA,CACLR,KAAqB,EACrBf,MAAqF,EACjF;IACJ,IAAI,CAACQ,OAAO,CAACe,SAAS,CAACR,KAAK,CAAClB,IAAI,EAAEG,MAAM,CAAC;EAC9C;EAEAwB,QAAQA,CAACC,MAAkC,EAAiB;IACxD,IAAI,CAACrB,MAAM,CAACsB,GAAG,CAACD,MAAM,CAAC;IACvB,OAAO,MAAM;MACT,IAAI,CAACrB,MAAM,CAACuB,MAAM,CAACF,MAAM,CAAC;IAC9B,CAAC;EACL;EAEAG,SAASA,CAAA,EAAY;IACjB,OAAO,IAAI,CAACC,iBAAiB,CAAC,CAAC,KAAKjB,SAAS;EACjD;EAEAkB,OAAOA,CAAA,EAAS;IACZ,IAAI,CAACxB,cAAc,GAAG,IAAI;IAC1B,IAAI,IAAI,CAACI,iBAAiB,EAAE;MACxB,IAAI,CAACJ,cAAc,GAAG,KAAK;MAC3B,MAAMyB,EAAE,GAAG,IAAI,CAACrB,iBAAiB;MACjC,IAAI,CAACA,iBAAiB,GAAGE,SAAS;MAClCmB,EAAE,CAACC,QAAQ,CAAC,CAAC;IACjB,CAAC,MAAM;MACH;MACA;MACA;MACAC,UAAU,CAAC,MAAM;QACb,IAAI,CAAC3B,cAAc,GAAG,KAAK;MAC/B,CAAC,EAAE,CAAC,CAAC;IACT;EACJ;EAEA4B,iBAAiBA,CAAA,EAAS;IACtB,MAAMH,EAAE,GAAG,IAAI,CAACrB,iBAAiB;IACjC,IAAI,CAACA,iBAAiB,GAAGE,SAAS;IAClC,IAAImB,EAAE,EAAE;MACJA,EAAE,CAACC,QAAQ,CAAC,CAAC;IACjB;EACJ;EAEAG,gBAAgBA,CAAA,EAAS;IACrB,IAAI,IAAI,CAACzB,iBAAiB,EAAE;MACxB,IAAI,CAACA,iBAAiB,CAAC0B,MAAM,CAAC,CAAC;MAC/B,IAAI,CAAC1B,iBAAiB,GAAGE,SAAS;IACtC;EACJ;EAEAyB,OAAOA,CAAA,EAAG;IACN,IAAI,CAAC7B,OAAO,CAAC6B,OAAO,CAAC,CAAC;EAC1B;EAEQ5B,cAAcA,CAAA,EAAS;IAC3B,IAAI,CAACD,OAAO,CAAC8B,WAAW,CAACC,UAAU,IAAI;MACnC,IAAI,IAAI,CAACjC,cAAc,EAAE;QACrB,IAAI,CAACA,cAAc,GAAG,KAAK;QAC3BiC,UAAU,CAACP,QAAQ,CAAC,CAAC;QACrB;MACJ;MAEA,MAAMQ,aAAa,GAAG,IAAI,CAACX,iBAAiB,CAAC,CAAC;MAC9C,IAAIW,aAAa,EAAE;QACf,IAAI,CAAC9B,iBAAiB,GAAG6B,UAAU;QACnCC,aAAa,CAACC,SAAS,CAAC,CAAC;MAC7B,CAAC,MAAM;QACHF,UAAU,CAACP,QAAQ,CAAC,CAAC;MACzB;IACJ,CAAC,CAAC;EACN;EAEQH,iBAAiBA,CAAA,EAA2C;IAChE,KAAK,MAAMJ,MAAM,IAAI,IAAI,CAACrB,MAAM,EAAE;MAC9B,IAAIqB,MAAM,CAACiB,KAAK,CAAC,CAAC,EAAE;QAChB,OAAOjB,MAAM;MACjB;IACJ;IACA,OAAOb,SAAS;EACpB;EAEQO,eAAe,GAAIJ,KAAiB,IAAK;IAC7C,OAAO;MACHlB,IAAI,EAAEkB,KAAK,CAAClB,IAAI;MAChBC,IAAI,EAAEiB,KAAK,CAACjB,IAAI;MAChB6C,OAAO,EAAE,IAAI,CAACC,iBAAiB,CAACC,IAAI,CAAC,IAAI;IAC7C,CAAC;EACL,CAAC;EAED,MAAcD,iBAAiBA,CAACE,YAA0B,EAAE;IACxD,MAAM/B,KAAK,GAAG,IAAI,CAACgC,cAAc,CAACD,YAAY,CAACjD,IAAI,CAAC;IACpD,IAAI,CAACkB,KAAK,EAAE;MACR;IACJ;IAEA,MAAMf,MAAM,GACR,OAAOe,KAAK,CAACf,MAAM,EAAEgD,KAAK,KAAK,UAAU,GACnCjC,KAAK,CAACf,MAAM,CAACgD,KAAK,CAACF,YAAY,CAAC9C,MAAM,CAAC,GACvC8C,YAAY,CAAC9C,MAAM;IAE7BR,WAAW,CAAC,MAAM;MACdyD,MAAM,CAACC,MAAM,CAAC,IAAI,CAAChD,YAAY,EAAE;QAC7B,GAAG4C,YAAY;QACf9C;MACJ,CAAC,CAAC;IACN,CAAC,CAAC;EACN;EAEQ+C,cAAcA,CAAClD,IAAY,EAAE;IACjC,OAAO,IAAI,CAACM,MAAM,CAACW,IAAI,CAACqC,aAAa,IAAIA,aAAa,CAACtD,IAAI,KAAKA,IAAI,CAAC;EACzE;AACJ;AAEA,OAAO,MAAMuD,gBAAgB,GAAG1D,oBAAoB,CAAC;EACjD2D,cAAc,EAAEpD,oBAAoB;EACpCqD,WAAW,EAAE7D,YAAY,CAAC2D,gBAAgB;EAC1CG,YAAY,EAAE,CAAC9D,YAAY,CAAC+D,aAAa;AAC7C,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["makeAutoObservable","runInAction","Abstractions","RouteUrl","INIT_ROUTE","name","path","pathname","params","RouterRepositoryImpl","currentRoute","routes","forceUnblocked","guardDisposers","Map","constructor","gateway","pendingTransition","getMatchedRoute","undefined","getCurrentRoute","find","route","registerRoutes","routesWithAction","map","routeWithAction","setRoutes","getLink","fromPattern","goToRoute","addGuard","config","gatewayGuard","guard","onBlocked","controller","disposeGatewayGuard","dispose","delete","set","isBlocked","unblock","tx","continue","setTimeout","confirmTransition","cancelTransition","cancel","destroy","onMatch","transitionToRoute","bind","matchedRoute","getRouteByName","parse","Object","assign","existingRoute","RouterRepository","createImplementation","implementation","dependencies","RouterGateway"],"sources":["RouterRepository.ts"],"sourcesContent":["import { makeAutoObservable, runInAction } from \"mobx\";\nimport type {\n    MatchedRoute,\n    RouteDefinition,\n    RouteTransitionGuardConfig,\n    GuardDisposer,\n    TransitionController\n} from \"./abstractions.js\";\nimport * as Abstractions from \"./abstractions.js\";\nimport { Route, RouteParamsDefinition, RouteParamsInfer } from \"./Route.js\";\nimport { RouteUrl } from \"./RouteUrl.js\";\n\nconst INIT_ROUTE = { name: \"__init__\", path: \"\", pathname: \"\", params: {} };\n\nclass RouterRepositoryImpl implements Abstractions.RouterRepository.Interface {\n    private gateway: Abstractions.RouterGateway.Interface;\n    private currentRoute: MatchedRoute = INIT_ROUTE;\n    private routes: Route<any>[] = [];\n    private pendingTransition: TransitionController | undefined;\n    private forceUnblocked = false;\n    private guardDisposers = new Map<RouteTransitionGuardConfig, GuardDisposer>();\n\n    constructor(gateway: Abstractions.RouterGateway.Interface) {\n        this.gateway = gateway;\n\n        makeAutoObservable(this, {\n            pendingTransition: false,\n            forceUnblocked: false\n        } as any);\n    }\n\n    getMatchedRoute() {\n        return this.currentRoute.name !== INIT_ROUTE.name ? this.currentRoute : undefined;\n    }\n\n    getCurrentRoute(): Route<any> | undefined {\n        return this.routes.find(route => route.name === this.currentRoute.name);\n    }\n\n    registerRoutes = (routes: Route[]) => {\n        this.routes = routes;\n        const routesWithAction = routes.map<RouteDefinition>(this.routeWithAction);\n\n        this.gateway.setRoutes(routesWithAction);\n    };\n\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params?: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): string {\n        return RouteUrl.fromPattern(route.path, params);\n    }\n\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): void {\n        this.gateway.goToRoute(route.name, params);\n    }\n\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer {\n        const gatewayGuard: RouteTransitionGuardConfig = {\n            guard: () => {\n                if (this.forceUnblocked) {\n                    this.forceUnblocked = false;\n                    return false;\n                }\n                return config.guard();\n            },\n            onBlocked: (controller: TransitionController) => {\n                this.pendingTransition = controller;\n                config.onBlocked(controller);\n            }\n        };\n\n        const disposeGatewayGuard = this.gateway.addGuard(gatewayGuard);\n\n        const dispose = () => {\n            this.guardDisposers.delete(config);\n            disposeGatewayGuard();\n        };\n\n        this.guardDisposers.set(config, dispose);\n        return dispose;\n    }\n\n    isBlocked(): boolean {\n        return this.pendingTransition !== undefined;\n    }\n\n    unblock(): void {\n        this.forceUnblocked = true;\n        if (this.pendingTransition) {\n            this.forceUnblocked = false;\n            const tx = this.pendingTransition;\n            this.pendingTransition = undefined;\n            tx.continue();\n        } else {\n            // No pending transition — expire the flag after the current\n            // call stack so it only covers synchronous navigations that\n            // follow immediately (e.g. router.goToRoute on the next line).\n            setTimeout(() => {\n                this.forceUnblocked = false;\n            }, 0);\n        }\n    }\n\n    confirmTransition(): void {\n        const tx = this.pendingTransition;\n        this.pendingTransition = undefined;\n        if (tx) {\n            tx.continue();\n        }\n    }\n\n    cancelTransition(): void {\n        if (this.pendingTransition) {\n            this.pendingTransition.cancel();\n            this.pendingTransition = undefined;\n        }\n    }\n\n    destroy() {\n        this.gateway.destroy();\n    }\n\n    private routeWithAction = (route: Route<any>) => {\n        return {\n            name: route.name,\n            path: route.path,\n            onMatch: this.transitionToRoute.bind(this)\n        };\n    };\n\n    private async transitionToRoute(matchedRoute: MatchedRoute) {\n        const route = this.getRouteByName(matchedRoute.name);\n        if (!route) {\n            return;\n        }\n\n        const params =\n            typeof route.params?.parse === \"function\"\n                ? route.params.parse(matchedRoute.params)\n                : matchedRoute.params;\n\n        runInAction(() => {\n            Object.assign(this.currentRoute, {\n                ...matchedRoute,\n                params\n            });\n        });\n    }\n\n    private getRouteByName(name: string) {\n        return this.routes.find(existingRoute => existingRoute.name === name);\n    }\n}\n\nexport const RouterRepository = Abstractions.RouterRepository.createImplementation({\n    implementation: RouterRepositoryImpl,\n    dependencies: [Abstractions.RouterGateway]\n});\n"],"mappings":"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","ignoreList":[]}

package/features/router/abstractions.d.ts

@@ -30,7 +30,7 @@ export interface MatchedRoute<TParams = Record<string, any>> {
     path: string;
     params: TParams;
 }
-interface IRouterRepository {
+export interface IRouterRepository {
     getMatchedRoute(): MatchedRoute | undefined;
     getCurrentRoute(): Route<any> | undefined;
     goToRoute<TParams extends RouteParamsDefinition | undefined>(route: Route<TParams>, params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined): void;
@@ -57,16 +57,13 @@ export type TransitionController = {
     continue: () => void;
     cancel: () => void;
 };
-export interface OnRouteExit {
-    (controller: TransitionController): void;
-}
 interface IRouterGateway {
     setRoutes(routes: RouteDefinition[]): void;
     goToRoute(name: string, params?: {
         [k: string]: any;
     }): void;
     pushState(url: string): void;
-    onRouteExit(cb: OnRouteExit): void;
+    addGuard(config: RouteTransitionGuardConfig): GuardDisposer;
     destroy(): void;
 }
 export declare const RouterGateway: Abstraction<IRouterGateway>;
@@ -79,6 +76,6 @@ export interface RouteTransitionGuardConfig {
     /** Return true to block the transition. */
     guard: () => boolean;
     /** Called when this guard blocks a transition. Show a confirmation dialog here. */
-    onBlocked: () => void;
+    onBlocked: (controller: TransitionController) => void;
 }
 export {};

package/features/router/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"names":["Abstraction","RouterPresenter","RouterRepository","RouterGateway"],"sources":["abstractions.ts"],"sourcesContent":["import { Abstraction } from \"@webiny/di\";\nimport type { Route, RouteParamsDefinition, RouteParamsInfer } from \"./Route.js\";\nimport type { RequiredKeysOf } from \"type-fest\";\n\n/***** Presenter *****/\n\nexport type RouteParamsArgs<TParams extends RouteParamsDefinition | undefined> =\n    TParams extends RouteParamsDefinition\n        ? RequiredKeysOf<RouteParamsInfer<TParams>> extends never\n            ? [params?: RouteParamsInfer<TParams>] // all optional → param optional\n            : [params: RouteParamsInfer<TParams>] // some required → param required\n        : [];\n\ninterface RouterViewModel {\n    currentRoute: MatchedRoute | undefined;\n}\n\nexport interface IRouterPresenter {\n    vm: RouterViewModel;\n    bootstrap(routes: Route[]): void;\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        ...args: RouteParamsArgs<TParams>\n    ): void;\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        ...args: RouteParamsArgs<TParams>\n    ): string;\n    setRouteParams<T extends Record<string, any>>(cb: (params: T) => T): void;\n    addTransitionGuard(config: RouteTransitionGuardConfig): GuardDisposer;\n    isTransitionBlocked(): boolean;\n    unblockTransition(): void;\n    confirmTransition(): void;\n    cancelTransition(): void;\n    destroy(): void;\n}\nexport const RouterPresenter = new Abstraction<IRouterPresenter>(\"RouterPresenter\");\n\nexport namespace RouterPresenter {\n    export type Interface = IRouterPresenter;\n}\n\n/***** Repository *****/\n\nexport interface MatchedRoute<TParams = Record<string, any>> {\n    // Name of the matched route.\n    name: string;\n    // Pathname that was used to match the route.\n    pathname: string;\n    // Path pattern that matched this route.\n    path: string;\n    // Route params extracted from the pathname.\n    params: TParams;\n}\n\ninterface IRouterRepository {\n    getMatchedRoute(): MatchedRoute | undefined;\n\n    getCurrentRoute(): Route<any> | undefined;\n\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): void;\n\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): string;\n\n    registerRoutes(routes: Route[]): void;\n\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer;\n    isBlocked(): boolean;\n    unblock(): void;\n    confirmTransition(): void;\n    cancelTransition(): void;\n\n    destroy(): void;\n}\n\nexport const RouterRepository = new Abstraction<IRouterRepository>(\"RouterRepository\");\n\nexport namespace RouterRepository {\n    export type Interface = IRouterRepository;\n}\n\n/***** Gateway *****/\n\nexport interface RouteDefinition {\n    name: string;\n    path: string;\n    onMatch(route: MatchedRoute): void;\n}\n\nexport type TransitionController = {\n    continue: () => void;\n    cancel: () => void;\n};\n\nexport interface OnRouteExit {\n    (controller: TransitionController): void;\n}\n\ninterface IRouterGateway {\n    setRoutes(routes: RouteDefinition[]): void;\n    goToRoute(name: string, params?: { [k: string]: any }): void;\n    pushState(url: string): void;\n    onRouteExit(cb: OnRouteExit): void;\n    destroy(): void;\n}\n\nexport const RouterGateway = new Abstraction<IRouterGateway>(\"RouterGateway\");\n\nexport namespace RouterGateway {\n    export type Interface = IRouterGateway;\n}\n\n/***** Route Transition *****/\n\nexport type GuardDisposer = () => void;\n\nexport interface RouteTransitionGuardConfig {\n    /** Return true to block the transition. */\n    guard: () => boolean;\n    /** Called when this guard blocks a transition. Show a confirmation dialog here. */\n    onBlocked: () => void;\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,YAAY;;AAIxC;;AAgCA,OAAO,MAAMC,eAAe,GAAG,IAAID,WAAW,CAAmB,iBAAiB,CAAC;;AAMnF;;AAuCA,OAAO,MAAME,gBAAgB,GAAG,IAAIF,WAAW,CAAoB,kBAAkB,CAAC;;AAMtF;;AAyBA,OAAO,MAAMG,aAAa,GAAG,IAAIH,WAAW,CAAiB,eAAe,CAAC;;AAM7E","ignoreList":[]}
+{"version":3,"names":["Abstraction","RouterPresenter","RouterRepository","RouterGateway"],"sources":["abstractions.ts"],"sourcesContent":["import { Abstraction } from \"@webiny/di\";\nimport type { Route, RouteParamsDefinition, RouteParamsInfer } from \"./Route.js\";\nimport type { RequiredKeysOf } from \"type-fest\";\n\n/***** Presenter *****/\n\nexport type RouteParamsArgs<TParams extends RouteParamsDefinition | undefined> =\n    TParams extends RouteParamsDefinition\n        ? RequiredKeysOf<RouteParamsInfer<TParams>> extends never\n            ? [params?: RouteParamsInfer<TParams>] // all optional → param optional\n            : [params: RouteParamsInfer<TParams>] // some required → param required\n        : [];\n\ninterface RouterViewModel {\n    currentRoute: MatchedRoute | undefined;\n}\n\nexport interface IRouterPresenter {\n    vm: RouterViewModel;\n    bootstrap(routes: Route[]): void;\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        ...args: RouteParamsArgs<TParams>\n    ): void;\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        ...args: RouteParamsArgs<TParams>\n    ): string;\n    setRouteParams<T extends Record<string, any>>(cb: (params: T) => T): void;\n    addTransitionGuard(config: RouteTransitionGuardConfig): GuardDisposer;\n    isTransitionBlocked(): boolean;\n    unblockTransition(): void;\n    confirmTransition(): void;\n    cancelTransition(): void;\n    destroy(): void;\n}\nexport const RouterPresenter = new Abstraction<IRouterPresenter>(\"RouterPresenter\");\n\nexport namespace RouterPresenter {\n    export type Interface = IRouterPresenter;\n}\n\n/***** Repository *****/\n\nexport interface MatchedRoute<TParams = Record<string, any>> {\n    // Name of the matched route.\n    name: string;\n    // Pathname that was used to match the route.\n    pathname: string;\n    // Path pattern that matched this route.\n    path: string;\n    // Route params extracted from the pathname.\n    params: TParams;\n}\n\nexport interface IRouterRepository {\n    getMatchedRoute(): MatchedRoute | undefined;\n\n    getCurrentRoute(): Route<any> | undefined;\n\n    goToRoute<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): void;\n\n    getLink<TParams extends RouteParamsDefinition | undefined>(\n        route: Route<TParams>,\n        params: TParams extends RouteParamsDefinition ? RouteParamsInfer<TParams> : undefined\n    ): string;\n\n    registerRoutes(routes: Route[]): void;\n\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer;\n    isBlocked(): boolean;\n    unblock(): void;\n    confirmTransition(): void;\n    cancelTransition(): void;\n\n    destroy(): void;\n}\n\nexport const RouterRepository = new Abstraction<IRouterRepository>(\"RouterRepository\");\n\nexport namespace RouterRepository {\n    export type Interface = IRouterRepository;\n}\n\n/***** Gateway *****/\n\nexport interface RouteDefinition {\n    name: string;\n    path: string;\n    onMatch(route: MatchedRoute): void;\n}\n\nexport type TransitionController = {\n    continue: () => void;\n    cancel: () => void;\n};\n\ninterface IRouterGateway {\n    setRoutes(routes: RouteDefinition[]): void;\n    goToRoute(name: string, params?: { [k: string]: any }): void;\n    pushState(url: string): void;\n    addGuard(config: RouteTransitionGuardConfig): GuardDisposer;\n    destroy(): void;\n}\n\nexport const RouterGateway = new Abstraction<IRouterGateway>(\"RouterGateway\");\n\nexport namespace RouterGateway {\n    export type Interface = IRouterGateway;\n}\n\n/***** Route Transition *****/\n\nexport type GuardDisposer = () => void;\n\nexport interface RouteTransitionGuardConfig {\n    /** Return true to block the transition. */\n    guard: () => boolean;\n    /** Called when this guard blocks a transition. Show a confirmation dialog here. */\n    onBlocked: (controller: TransitionController) => void;\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,YAAY;;AAIxC;;AAgCA,OAAO,MAAMC,eAAe,GAAG,IAAID,WAAW,CAAmB,iBAAiB,CAAC;;AAMnF;;AAuCA,OAAO,MAAME,gBAAgB,GAAG,IAAIF,WAAW,CAAoB,kBAAkB,CAAC;;AAMtF;;AAqBA,OAAO,MAAMG,aAAa,GAAG,IAAIH,WAAW,CAAiB,eAAe,CAAC;;AAM7E","ignoreList":[]}

package/features/router/index.d.ts

@@ -1,2 +1,2 @@
 export { RouterPresenter, RouterGateway } from "./abstractions.js";
-export type { RouteTransitionGuardConfig, GuardDisposer } from "./abstractions.js";
+export type { RouteTransitionGuardConfig, GuardDisposer, TransitionController } from "./abstractions.js";

package/features/router/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["RouterPresenter","RouterGateway"],"sources":["index.ts"],"sourcesContent":["export { RouterPresenter, RouterGateway } from \"./abstractions.js\";\nexport type { RouteTransitionGuardConfig, GuardDisposer } from \"./abstractions.js\";\n"],"mappings":"AAAA,SAASA,eAAe,EAAEC,aAAa","ignoreList":[]}
+{"version":3,"names":["RouterPresenter","RouterGateway"],"sources":["index.ts"],"sourcesContent":["export { RouterPresenter, RouterGateway } from \"./abstractions.js\";\nexport type {\n    RouteTransitionGuardConfig,\n    GuardDisposer,\n    TransitionController\n} from \"./abstractions.js\";\n"],"mappings":"AAAA,SAASA,eAAe,EAAEC,aAAa","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app",
-	"version": "6.1.0",
+	"version": "6.2.0",
 	"type": "module",
 	"main": "index.js",
 	"repository": {
@@ -17,14 +17,14 @@
 	"dependencies": {
 		"@apollo/react-hooks": "3.1.5",
 		"@emotion/styled": "11.14.1",
-		"@types/react": "18.2.79",
+		"@types/react": "18.3.28",
 		"@webiny/di": "0.2.3",
-		"@webiny/feature": "6.1.0",
-		"@webiny/i18n": "6.1.0",
-		"@webiny/i18n-react": "6.1.0",
-		"@webiny/plugins": "6.1.0",
-		"@webiny/react-composition": "6.1.0",
-		"@webiny/react-properties": "6.1.0",
+		"@webiny/feature": "6.2.0",
+		"@webiny/i18n": "6.2.0",
+		"@webiny/i18n-react": "6.2.0",
+		"@webiny/plugins": "6.2.0",
+		"@webiny/react-composition": "6.2.0",
+		"@webiny/react-properties": "6.2.0",
 		"apollo-cache": "1.3.5",
 		"apollo-cache-inmemory": "1.6.6",
 		"apollo-client": "2.6.10",
@@ -38,12 +38,12 @@
 		"graphql": "16.13.2",
 		"history": "5.3.0",
 		"invariant": "2.2.4",
-		"lodash": "4.17.23",
-		"minimatch": "10.2.4",
+		"lodash": "4.18.1",
+		"minimatch": "10.2.5",
 		"mobx": "6.15.0",
 		"nanoid": "5.1.7",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
+		"react": "18.3.1",
+		"react-dom": "18.3.1",
 		"ts-invariant": "0.10.3",
 		"warning": "4.0.3",
 		"zod": "4.3.6"
@@ -51,11 +51,11 @@
 	"devDependencies": {
 		"@types/lodash": "4.17.24",
 		"@types/warning": "3.0.4",
-		"@webiny/build-tools": "6.1.0",
+		"@webiny/build-tools": "6.2.0",
 		"rimraf": "6.1.3",
 		"type-fest": "5.5.0",
 		"typescript": "5.9.3",
-		"vitest": "4.1.2"
+		"vitest": "4.1.4"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -68,5 +68,5 @@
 			]
 		}
 	},
-	"gitHead": "65e0ac1889b3392c99b8cac6cde508e1e831c715"
+	"gitHead": "3d3148358b6febbc857371930871743bec3b3939"
 }

package/shared/di/useFeature.js

@@ -1,18 +1,8 @@
+import { useMemo } from "react";
 import { useContainer } from "./DiContainerProvider.js";
-const featureCache = new WeakMap();
 export function useFeature(feature) {
   const container = useContainer();
-  let featureMap = featureCache.get(container);
-  if (!featureMap) {
-    featureMap = new Map();
-    featureCache.set(container, featureMap);
-  }
-  if (featureMap.has(feature.name)) {
-    return featureMap.get(feature.name);
-  }
-  const exports = feature.resolve(container);
-  featureMap.set(feature.name, exports);
-  return exports;
+  return useMemo(() => feature.resolve(container), [container, feature]);
 }
 
 //# sourceMappingURL=useFeature.js.map