@web-atoms/core 2.6.21 → 2.6.25

package/dist-esm/core/Command.js

@@ -3,237 +3,250 @@ import Route from "./Route.js";
 import { CancelToken } from "./types.js";
 export const routeSymbol = Symbol("routeSymbol");
 export const displayRouteSymbol = Symbol("displayRouteSymbol");
-document.body.addEventListener("click", (ce) => {
-    let target = ce.target;
-    let clickCommand;
-    let commandParameter;
-    while (target) {
-        clickCommand = target.getAttribute("data-click-command");
-        const cp = target.commandParameter;
-        if (cp) {
-            commandParameter = cp;
-        }
-        if (clickCommand) {
-            break;
-        }
-        target = target.parentElement;
-    }
-    if (!clickCommand) {
-        return;
+document.body.addEventListener("click", ce => {
+  let target = ce.target;
+  let clickCommand;
+  let commandParameter;
+  while (target) {
+    clickCommand = target.getAttribute("data-click-command");
+    const cp = target.commandParameter;
+    if (cp) {
+      commandParameter = cp;
     }
-    const cmd = Command.registry.get(clickCommand);
-    if (cmd) {
-        cmd.eventScope.dispatch(target, commandParameter);
+    if (clickCommand) {
+      break;
     }
+    target = target.parentElement;
+  }
+  if (!clickCommand) {
+    return;
+  }
+  const cmd = Command.registry.get(clickCommand);
+  if (cmd) {
+    cmd.eventScope.dispatch(target, commandParameter);
+  }
 });
 let id = 1;
-export class PageCommands {
-}
-const defaultOrSelf = (x) => x?.default ?? x;
+export class PageCommands {}
+const defaultOrSelf = x => x?.default ?? x;
 export default class Command {
-    static { this.routePrefix = ""; }
-    static { this.registry = new Map(); }
-    static { this.routes = []; }
-    static invokeRoute(route = location.hash.startsWith("#!")
-        ? location.hash.substring(2)
-        : location.href, forceDisplay = false) {
-        let sp;
-        if (/^http(s)?\:\/\//i.test(route)) {
-            const url = new URL(route);
-            sp = url.searchParams;
-            route = url.hash.startsWith("#!") ? url.hash.substring(2) : url.pathname;
-        }
-        else {
-            if (route.startsWith("#!")) {
-                route = route.substring(2);
-            }
-        }
-        const index = route.indexOf("?");
-        if (index !== -1) {
-            sp = new URLSearchParams(route.substring(index + 1));
-            route = route.substring(0, index);
-        }
-        else {
-            sp ??= new URLSearchParams("");
-        }
-        for (const iterator of this.routes) {
-            const params = iterator.route.matches(route, sp);
-            if (params) {
-                params[routeSymbol] = route;
-                params[displayRouteSymbol] = forceDisplay
-                    ? (sp.size > 0 ? `${route}?${sp.toString()}` : route)
-                    : "";
-                iterator.dispatch(params, true);
-                return iterator;
-            }
-        }
+  static {
+    this.routePrefix = "";
+  }
+  static {
+    this.registry = new Map();
+  }
+  static {
+    this.routes = [];
+  }
+  static invokeRoute(route = location.hash.startsWith("#!") ? location.hash.substring(2) : location.href, forceDisplay = false) {
+    let sp;
+    if (/^http(s)?\:\/\//i.test(route)) {
+      const url = new URL(route);
+      sp = url.searchParams;
+      route = url.hash.startsWith("#!") ? url.hash.substring(2) : url.pathname;
+    } else {
+      if (route.startsWith("#!")) {
+        route = route.substring(2);
+      }
     }
-    static create({ name = `command${id++}`, eventScope = EventScope.create(), route, routeQueries, routeOrder = 0, routeDefaults, pageLoader, pageListener, openPage, pushPage, registerOnClick, pushPageForResult, pushPageForResultOrCancel, listener }) {
-        let cmd = new Command(name, eventScope, registerOnClick);
-        if (route) {
-            if (this.routePrefix) {
-                if (!route.startsWith(this.routePrefix)) {
-                    route = this.routePrefix + route;
-                }
-            }
-            cmd = cmd.withRoute(route, routeQueries, routeOrder, routeDefaults);
-        }
-        cmd.listener = listener;
-        if (openPage) {
-            let pageType;
-            cmd.listener = async (ce) => {
-                const p = ce.detail ?? {};
-                return p.returnResult
-                    ? PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await openPage()), p)
-                    : PageCommands.openPage(pageType ??= defaultOrSelf(await openPage()), p);
-            };
-        }
-        if (pushPage) {
-            let pageType;
-            cmd.listener = async (ce) => {
-                const p = ce.detail ?? {};
-                return p.returnResult
-                    ? PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPage()), p)
-                    : PageCommands.pushPage(pageType ??= defaultOrSelf(await pushPage()), p);
-            };
-        }
-        if (pushPageForResult) {
-            let pageType;
-            cmd.listener = async (ce) => PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPageForResult()), ce.detail ?? {});
-        }
-        if (pushPageForResultOrCancel) {
-            let pageType;
-            cmd.listener = async (ce) => {
-                try {
-                    return await PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPageForResultOrCancel()), ce.detail ?? {});
-                }
-                catch (e) {
-                    if (CancelToken.isCancelled(e)) {
-                        return;
-                    }
-                    console.error(e);
-                }
-            };
-        }
-        if (pageLoader) {
-            let pageType;
-            cmd.listener = async (ce) => {
-                try {
-                    pageType ??= defaultOrSelf(await pageLoader());
-                    return pageListener(pageType)(ce);
-                }
-                catch (e) {
-                    if (CancelToken.isCancelled(e)) {
-                        return;
-                    }
-                    console.error(e);
-                }
-            };
-        }
-        return cmd;
-    }
-    get eventName() {
-        return this.eventScope.eventType;
-    }
-    get route() {
-        return this.routeObj;
-    }
-    constructor(name = `command${id++}`, eventScope = EventScope.create(), registerOnClick = (p) => ({
-        "data-click-command": this.name,
-        "commandParameter": p
-    })) {
-        this.name = name;
-        this.eventScope = eventScope;
-        this.registerOnClick = registerOnClick;
-        Command.registry.set(this.name, this);
-    }
-    displayRoute(p, absoluteUrl = false) {
-        let route = Route.encodeUrl(this.routeObj.substitute(p));
-        if (absoluteUrl) {
-            if (route.startsWith("#!")) {
-                route = location.href.split("#")[0] + route;
-            }
-            else if (route.startsWith("/")) {
-                route = location.protocol + "//" + location.host + route;
-            }
-        }
-        return route;
-    }
-    withRoute(route, queries, order = 0, defaults) {
-        this.routeObj = Route.create(route, queries, order);
-        Command.routes.push(this);
-        Command.routes.sort((a, b) => a.route.order - b.route.order);
-        this.defaults = defaults;
-        return this;
-    }
-    listen(r, handler = this.listener) {
-        if (!handler) {
-            throw new Error("Handler must be specified...");
-        }
-        const d = this.eventScope.listen((e) => {
-            const ce = e;
-            try {
-                ce.executed = true;
-                ce.promise = handler(e);
-            }
-            catch (error) {
-                ce.promise = Promise.reject(error);
-            }
-            r.app.runAsync(() => ce.promise);
-        });
-        return r.registerDisposable(d);
-    }
-    dispatch(detail, cancelable) {
-        if (this.route) {
-            detail = this.updateRoute(detail);
-        }
-        this.eventScope.dispatch(document.body, detail, { cancelable, bubbles: true });
-    }
-    updateRoute(detail) {
-        const d = detail ??= {};
-        let r = d[routeSymbol];
-        if (r === null || r === void 0) {
-            r = this.route.substitute(d);
-            d[routeSymbol] = r;
-            d[displayRouteSymbol] = r;
-        }
-        const { defaults } = this;
-        if (defaults) {
-            for (const key in defaults) {
-                if (Object.prototype.hasOwnProperty.call(defaults, key)) {
-                    const element = defaults[key];
-                    if (d[key] === void 0) {
-                        d[key] = element;
-                    }
-                }
-            }
-        }
-        return detail;
+    const index = route.indexOf("?");
+    if (index !== -1) {
+      sp = new URLSearchParams(route.substring(index + 1));
+      route = route.substring(0, index);
+    } else {
+      sp ??= new URLSearchParams("");
     }
-    async dispatchAsync(detail, cancelable) {
-        if (this.route) {
-            detail = this.updateRoute(detail);
-        }
-        const ce = new CustomEvent(this.eventScope.eventType, { detail, cancelable });
-        ce.returnResult = true;
-        window.dispatchEvent(ce);
-        if (ce.executed) {
-            const promise = ce.promise;
-            if (promise) {
-                return await promise;
-            }
-        }
+    for (const iterator of this.routes) {
+      const params = iterator.route.matches(route, sp);
+      if (params) {
+        params[routeSymbol] = route;
+        params[displayRouteSymbol] = forceDisplay ? sp.size > 0 ? `${route}?${sp.toString()}` : route : "";
+        iterator.dispatch(params, true);
+        return iterator;
+      }
+    }
+  }
+  static create({
+    name = `command${id++}`,
+    eventScope = EventScope.create(),
+    route,
+    routeQueries,
+    routeOrder = 0,
+    routeDefaults,
+    pageLoader,
+    pageListener,
+    openPage,
+    pushPage,
+    registerOnClick,
+    pushPageForResult,
+    pushPageForResultOrCancel,
+    listener
+  }) {
+    let cmd = new Command(name, eventScope, registerOnClick);
+    if (route) {
+      if (this.routePrefix) {
+        if (!route.startsWith(this.routePrefix)) {
+          route = this.routePrefix + route;
+        }
+      }
+      cmd = cmd.withRoute(route, routeQueries, routeOrder, routeDefaults);
+    }
+    cmd.listener = listener;
+    if (openPage) {
+      let pageType;
+      cmd.listener = async ce => {
+        const p = ce.detail ?? {};
+        return p.returnResult ? PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await openPage()), p) : PageCommands.openPage(pageType ??= defaultOrSelf(await openPage()), p);
+      };
+    }
+    if (pushPage) {
+      let pageType;
+      cmd.listener = async ce => {
+        const p = ce.detail ?? {};
+        return p.returnResult ? PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPage()), p) : PageCommands.pushPage(pageType ??= defaultOrSelf(await pushPage()), p);
+      };
+    }
+    if (pushPageForResult) {
+      let pageType;
+      cmd.listener = async ce => PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPageForResult()), ce.detail ?? {});
+    }
+    if (pushPageForResultOrCancel) {
+      let pageType;
+      cmd.listener = async ce => {
+        try {
+          return await PageCommands.pushPageForResult(pageType ??= defaultOrSelf(await pushPageForResultOrCancel()), ce.detail ?? {});
+        } catch (e) {
+          if (CancelToken.isCancelled(e)) {
+            return;
+          }
+          console.error(e);
+        }
+      };
+    }
+    if (pageLoader) {
+      let pageType;
+      cmd.listener = async ce => {
+        try {
+          pageType ??= defaultOrSelf(await pageLoader());
+          return pageListener(pageType)(ce);
+        } catch (e) {
+          if (CancelToken.isCancelled(e)) {
+            return;
+          }
+          console.error(e);
+        }
+      };
     }
+    return cmd;
+  }
+  get eventName() {
+    return this.eventScope.eventType;
+  }
+  get route() {
+    return this.routeObj;
+  }
+  constructor(name = `command${id++}`, eventScope = EventScope.create(), registerOnClick = p => ({
+    "data-click-command": this.name,
+    "commandParameter": p
+  })) {
+    this.name = name;
+    this.eventScope = eventScope;
+    this.registerOnClick = registerOnClick;
+    Command.registry.set(this.name, this);
+  }
+  displayRoute(p, absoluteUrl = false) {
+    let route = Route.encodeUrl(this.routeObj.substitute(p));
+    if (absoluteUrl) {
+      if (route.startsWith("#!")) {
+        route = location.href.split("#")[0] + route;
+      } else if (route.startsWith("/")) {
+        route = location.protocol + "//" + location.host + route;
+      }
+    }
+    return route;
+  }
+  withRoute(route, queries, order = 0, defaults) {
+    this.routeObj = Route.create(route, queries, order);
+    Command.routes.push(this);
+    Command.routes.sort((a, b) => a.route.order - b.route.order);
+    this.defaults = defaults;
+    return this;
+  }
+  listen(r, handler = this.listener) {
+    if (!handler) {
+      throw new Error("Handler must be specified...");
+    }
+    const d = this.eventScope.listen(e => {
+      const ce = e;
+      try {
+        ce.executed = true;
+        ce.promise = handler(e);
+      } catch (error) {
+        ce.promise = Promise.reject(error);
+      }
+      r.app.runAsync(() => ce.promise);
+    });
+    return r.registerDisposable(d);
+  }
+  dispatch(detail, cancelable) {
+    if (this.route) {
+      detail = this.updateRoute(detail);
+    }
+    this.eventScope.dispatch(document.body, detail, {
+      cancelable,
+      bubbles: true
+    });
+  }
+  updateRoute(detail) {
+    const d = detail ??= {};
+    let r = d[routeSymbol];
+    if (r === null || r === void 0) {
+      r = this.route.substitute(d);
+      d[routeSymbol] = r;
+      d[displayRouteSymbol] = r;
+    }
+    const {
+      defaults
+    } = this;
+    if (defaults) {
+      for (const key in defaults) {
+        if (Object.prototype.hasOwnProperty.call(defaults, key)) {
+          const element = defaults[key];
+          if (d[key] === void 0) {
+            d[key] = element;
+          }
+        }
+      }
+    }
+    return detail;
+  }
+  async dispatchAsync(detail, cancelable) {
+    if (this.route) {
+      detail = this.updateRoute(detail);
+    }
+    const ce = new CustomEvent(this.eventScope.eventType, {
+      detail,
+      cancelable
+    });
+    ce.returnResult = true;
+    window.dispatchEvent(ce);
+    if (ce.executed) {
+      const promise = ce.promise;
+      if (promise) {
+        return await promise;
+      }
+    }
+  }
 }
 export class Commands {
-    static install(control) {
-        this.app = control.app;
-        for (const key in this) {
-            const element = this[key];
-            if (element instanceof Command) {
-                element.listen(control);
-            }
-        }
+  static install(control) {
+    this.app = control.app;
+    for (const key in this) {
+      const element = this[key];
+      if (element instanceof Command) {
+        element.listen(control);
+      }
     }
-}
-//# sourceMappingURL=Command.js.map
+  }
+}

package/dist-esm/core/Defer.js

@@ -1,26 +1,25 @@
 import { CancelToken } from "./types.js";
 export default function Defer(n = 250) {
-    return (target, key, descriptor) => {
-        const old = descriptor.value;
-        const k = Symbol.for(`defer_${key}`);
-        descriptor.value = function (...a) {
-            const id = this[k];
-            if (id) {
-                clearTimeout(id);
+  return (target, key, descriptor) => {
+    const old = descriptor.value;
+    const k = Symbol.for(`defer_${key}`);
+    descriptor.value = function (...a) {
+      const id = this[k];
+      if (id) {
+        clearTimeout(id);
+      }
+      this[k] = setTimeout(() => {
+        this[k] = undefined;
+        const result = old.apply(this, a);
+        if (result?.then) {
+          result.catch(e => {
+            if (CancelToken.isCancelled(e)) {
+              return;
             }
-            this[k] = setTimeout(() => {
-                this[k] = undefined;
-                const result = old.apply(this, a);
-                if (result?.then) {
-                    result.catch((e) => {
-                        if (CancelToken.isCancelled(e)) {
-                            return;
-                        }
-                        console.error(e);
-                    });
-                }
-            }, n);
-        };
+            console.error(e);
+          });
+        }
+      }, n);
     };
-}
-//# sourceMappingURL=Defer.js.map
+  };
+}