exta2 0.0.1-beta.29 → 0.0.1-beta.31

package/dist/components.js

@@ -55,12 +55,12 @@ function Link({ href, onClick, prefetch, preload, ...props }) {
     if (e.defaultPrevented || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || props.target === "_blank")
       return;
     let current = window.location, target = new URL(href, current.href), isHashOnly = href.startsWith("#"), isSamePath = target.pathname === current.pathname, isHashChange = target.hash && target.hash !== current.hash;
-    if (!(isHashOnly || isSamePath && isHashChange) && (e.preventDefault(), e.stopPropagation(), !(onClick && (await onClick(e), e.defaultPrevented)))) {
+    if (!(isHashOnly || isSamePath && isHashChange) && !(onClick && (await onClick(e), e.defaultPrevented))) {
       if (isExternal(href)) {
         window.location.href = href;
         return;
       }
-      await extaRouter.goto(target.pathname), router.push(target.pathname + target.search + target.hash);
+      e.preventDefault(), e.stopPropagation(), await extaRouter.goto(target.pathname), router.push(target.pathname + target.search + target.hash);
     }
   } }, props.children);
 }

package/dist/components.mjs

@@ -19,12 +19,12 @@ function Link({ href, onClick, prefetch, preload, ...props }) {
     if (e.defaultPrevented || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || props.target === "_blank")
       return;
     let current = window.location, target = new URL(href, current.href), isHashOnly = href.startsWith("#"), isSamePath = target.pathname === current.pathname, isHashChange = target.hash && target.hash !== current.hash;
-    if (!(isHashOnly || isSamePath && isHashChange) && (e.preventDefault(), e.stopPropagation(), !(onClick && (await onClick(e), e.defaultPrevented)))) {
+    if (!(isHashOnly || isSamePath && isHashChange) && !(onClick && (await onClick(e), e.defaultPrevented))) {
       if (isExternal(href)) {
         window.location.href = href;
         return;
       }
-      await extaRouter.goto(target.pathname), router.push(target.pathname + target.search + target.hash);
+      e.preventDefault(), e.stopPropagation(), await extaRouter.goto(target.pathname), router.push(target.pathname + target.search + target.hash);
     }
   } }, props.children);
 }

package/dist/router.d.ts

@@ -25,6 +25,7 @@ declare class Router {
     modules: Record<string, any>;
     data: Map<string, any>;
     loadedModules: Map<string, any>;
+    hook: EventTarget;
     constructor(routes: PageManifest[]);
     prefetch(url: string): Promise<void>;
     getHref(page: PageManifest): string;

package/dist/router.js

@@ -217,8 +217,9 @@ var Router = class {
   modules = {};
   data = /* @__PURE__ */ new Map();
   loadedModules = /* @__PURE__ */ new Map();
+  hook;
   constructor(routes) {
-    this.routes = routes;
+    this.hook = new EventTarget(), this.routes = routes;
   }
   async prefetch(url) {
     let _url = prettyURL(url);
@@ -257,13 +258,16 @@ var Router = class {
     return url = url.toLowerCase(), findPage(url, this.routes);
   }
   async goto(href) {
+    this.hook.dispatchEvent(new Event("load:start"));
     let url = decodeURIComponent(
       new URL(href, window.location.origin).pathname
     ).toLowerCase(), page = this.findPage(url);
-    if (await this.loadLayout(), await this.loadError(), !page)
+    if (await this.loadLayout(), await this.loadError(), !page) {
+      this.hook.dispatchEvent(new Event("load:end"));
       return;
+    }
     let pageModule = this.loadedModules.has(page.path) ? this.loadedModules.get(page.path) : this.loadedModules.set(page.path, await import_exta_pages.default[page.path]()).get(page.path), _url = prettyURL(url), data = this.data.has(_url) ? this.data.get(_url) : this.data.set(_url, await loadPageData(url)).get(_url);
-    if (this.modules[page.path] = pageModule, data?.status !== 404)
+    if (this.modules[page.path] = pageModule, this.hook.dispatchEvent(new Event("load:end")), data?.status !== 404)
       return { module: this.modules, data };
   }
 }, router = new Router(import_exta_manifest.PAGES_MANIFEST);

package/dist/router.mjs

@@ -188,8 +188,9 @@ var Router = class {
   modules = {};
   data = /* @__PURE__ */ new Map();
   loadedModules = /* @__PURE__ */ new Map();
+  hook;
   constructor(routes) {
-    this.routes = routes;
+    this.hook = new EventTarget(), this.routes = routes;
   }
   async prefetch(url) {
     let _url = prettyURL(url);
@@ -228,13 +229,16 @@ var Router = class {
     return url = url.toLowerCase(), findPage(url, this.routes);
   }
   async goto(href) {
+    this.hook.dispatchEvent(new Event("load:start"));
     let url = decodeURIComponent(
       new URL(href, window.location.origin).pathname
     ).toLowerCase(), page = this.findPage(url);
-    if (await this.loadLayout(), await this.loadError(), !page)
+    if (await this.loadLayout(), await this.loadError(), !page) {
+      this.hook.dispatchEvent(new Event("load:end"));
       return;
+    }
     let pageModule = this.loadedModules.has(page.path) ? this.loadedModules.get(page.path) : this.loadedModules.set(page.path, await pages[page.path]()).get(page.path), _url = prettyURL(url), data = this.data.has(_url) ? this.data.get(_url) : this.data.set(_url, await loadPageData(url)).get(_url);
-    if (this.modules[page.path] = pageModule, data?.status !== 404)
+    if (this.modules[page.path] = pageModule, this.hook.dispatchEvent(new Event("load:end")), data?.status !== 404)
       return { module: this.modules, data };
   }
 }, router = new Router(manifest);

package/env.d.ts

@@ -31,6 +31,25 @@ declare module '$exta-router' {
     params: string[];
   }
 
+  interface LoaderEventMap {
+    'load:start': void;
+    'load:end': void;
+  }
+
+  declare class LoaderHook extends EventTarget {
+    addEventListener<K extends keyof LoaderEventMap>(
+      type: K,
+      listener: (ev: CustomEvent<void>) => void,
+      options?: boolean | AddEventListenerOptions,
+    ): void;
+
+    removeEventListener<K extends keyof LoaderEventMap>(
+      type: K,
+      listener: (ev: CustomEvent<void>) => void,
+      options?: boolean | EventListenerOptions,
+    ): void;
+  }
+
   /**
    * Return `url.location`.
    */
@@ -81,6 +100,8 @@ declare module '$exta-router' {
      */
     data: Map<string, any>;
 
+    hook: LoaderHook;
+
     constructor(routes: PageManifest[]);
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exta2",
-  "version": "0.0.1-beta.29",
+  "version": "0.0.1-beta.31",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",