@domql/router 2.5.190 → 3.0.0

package/dist/cjs/index.js

@@ -16,22 +16,22 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var router_exports = {};
-__export(router_exports, {
-  default: () => router_default,
+var index_exports = {};
+__export(index_exports, {
+  default: () => index_default,
   getActiveRoute: () => getActiveRoute,
   lastLevel: () => lastLevel,
   lastPathname: () => lastPathname,
   router: () => router
 });
-module.exports = __toCommonJS(router_exports);
+module.exports = __toCommonJS(index_exports);
 var import_event = require("@domql/event");
 var import_utils = require("@domql/utils");
+var import_set = require("@domql/element/set");
 const getActiveRoute = (level = 0, route = import_utils.window.location.pathname) => {
   const routeArray = route.split("/");
   const activeRoute = routeArray[level + 1];
-  if (activeRoute)
-    return `/${activeRoute}`;
+  if (activeRoute) return `/${activeRoute}`;
 };
 let lastPathname;
 let lastLevel = 0;
@@ -49,17 +49,21 @@ const defaultOptions = {
   contentElementKey: "content",
   scrollToOptions: { behavior: "smooth" }
 };
-const router = (path, el, state = {}, options = {}) => {
+const router = async (path, el, state = {}, options = {}) => {
   const element = el || void 0;
   const win = element.context.window || import_utils.window;
   const doc = element.context.document || import_utils.document;
-  const opts = { ...defaultOptions, ...element.context.routerOptions, ...options };
+  const opts = {
+    ...defaultOptions,
+    ...element.context.routerOptions,
+    ...options
+  };
   lastLevel = opts.lastLevel;
   const ref = element.__ref;
   if (opts.contentElementKey !== "content" && opts.contentElementKey !== ref.contentElementKey || !ref.contentElementKey) {
     ref.contentElementKey = opts.contentElementKey || "content";
   }
-  const contentElementKey = (0, import_utils.setContentKey)(element, opts);
+  const contentElementKey = (0, import_set.setContentKey)(element, opts);
   const urlObj = new win.URL(win.location.origin + path);
   const { pathname, search, hash } = urlObj;
   const rootNode = element.node;
@@ -78,15 +82,21 @@ const router = (path, el, state = {}, options = {}) => {
   }
   if (pathChanged || !hashChanged) {
     if (opts.updateState) {
-      element.state.update({ route, hash, debugging: false }, { preventContentUpdate: true });
+      await element.state.update(
+        { route, hash, debugging: false },
+        { preventContentUpdate: true }
+      );
     }
     if (contentElementKey && opts.removeOldElement) {
       element[contentElementKey].remove();
     }
-    element.set({
-      tag: opts.useFragment && "fragment",
-      extend: content
-    }, { contentElementKey });
+    await element.set(
+      {
+        tag: opts.useFragment && "fragment",
+        extends: content
+      },
+      { contentElementKey }
+    );
   }
   if (opts.scrollToTop) {
     scrollNode.scrollTo({
@@ -113,6 +123,6 @@ const router = (path, el, state = {}, options = {}) => {
       });
     }
   }
-  (0, import_event.triggerEventOn)("routeChanged", element, opts);
+  await (0, import_event.triggerEventOn)("routeChanged", element, opts);
 };
-var router_default = router;
+var index_default = router;

package/dist/esm/index.js

@@ -18,12 +18,12 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { triggerEventOn } from "@domql/event";
-import { setContentKey, document, window } from "@domql/utils";
+import { document, window } from "@domql/utils";
+import { setContentKey } from "@domql/element/set";
 const getActiveRoute = (level = 0, route = window.location.pathname) => {
   const routeArray = route.split("/");
   const activeRoute = routeArray[level + 1];
-  if (activeRoute)
-    return `/${activeRoute}`;
+  if (activeRoute) return `/${activeRoute}`;
 };
 let lastPathname;
 let lastLevel = 0;
@@ -41,7 +41,7 @@ const defaultOptions = {
   contentElementKey: "content",
   scrollToOptions: { behavior: "smooth" }
 };
-const router = (path, el, state = {}, options = {}) => {
+const router = async (path, el, state = {}, options = {}) => {
   const element = el || void 0;
   const win = element.context.window || window;
   const doc = element.context.document || document;
@@ -70,15 +70,21 @@ const router = (path, el, state = {}, options = {}) => {
   }
   if (pathChanged || !hashChanged) {
     if (opts.updateState) {
-      element.state.update({ route, hash, debugging: false }, { preventContentUpdate: true });
+      await element.state.update(
+        { route, hash, debugging: false },
+        { preventContentUpdate: true }
+      );
     }
     if (contentElementKey && opts.removeOldElement) {
       element[contentElementKey].remove();
     }
-    element.set({
-      tag: opts.useFragment && "fragment",
-      extend: content
-    }, { contentElementKey });
+    await element.set(
+      {
+        tag: opts.useFragment && "fragment",
+        extends: content
+      },
+      { contentElementKey }
+    );
   }
   if (opts.scrollToTop) {
     scrollNode.scrollTo(__spreadProps(__spreadValues({}, opts.scrollToOptions || {}), {
@@ -102,11 +108,11 @@ const router = (path, el, state = {}, options = {}) => {
       }));
     }
   }
-  triggerEventOn("routeChanged", element, opts);
+  await triggerEventOn("routeChanged", element, opts);
 };
-var router_default = router;
+var index_default = router;
 export {
-  router_default as default,
+  index_default as default,
   getActiveRoute,
   lastLevel,
   lastPathname,

package/index.js

@@ -1,7 +1,8 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { setContentKey, document, window } from '@domql/utils'
+import { document, window } from '@domql/utils'
+import { setContentKey } from '@domql/element/set'
 
 export const getActiveRoute = (level = 0, route = window.location.pathname) => {
   const routeArray = route.split('/')
@@ -27,20 +28,23 @@ const defaultOptions = {
   scrollToOptions: { behavior: 'smooth' }
 }
 
-export const router = (
-  path,
-  el,
-  state = {},
-  options = {}
-) => {
+export const router = async (path, el, state = {}, options = {}) => {
   const element = el || this
   const win = element.context.window || window
   const doc = element.context.document || document
-  const opts = { ...defaultOptions, ...element.context.routerOptions, ...options }
+  const opts = {
+    ...defaultOptions,
+    ...element.context.routerOptions,
+    ...options
+  }
   lastLevel = opts.lastLevel
   const ref = element.__ref
 
-  if ((opts.contentElementKey !== 'content' && opts.contentElementKey !== ref.contentElementKey) || !ref.contentElementKey) {
+  if (
+    (opts.contentElementKey !== 'content' &&
+      opts.contentElementKey !== ref.contentElementKey) ||
+    !ref.contentElementKey
+  ) {
     ref.contentElementKey = opts.contentElementKey || 'content'
   }
 
@@ -68,42 +72,57 @@ export const router = (
 
   if (pathChanged || !hashChanged) {
     if (opts.updateState) {
-      element.state.update({ route, hash, debugging: false }, { preventContentUpdate: true })
+      await element.state.update(
+        { route, hash, debugging: false },
+        { preventContentUpdate: true }
+      )
     }
 
     if (contentElementKey && opts.removeOldElement) {
       element[contentElementKey].remove()
     }
 
-    element.set({
-      tag: opts.useFragment && 'fragment',
-      extend: content
-    }, { contentElementKey })
+    await element.set(
+      {
+        tag: opts.useFragment && 'fragment',
+        extends: content
+      },
+      { contentElementKey }
+    )
   }
 
   if (opts.scrollToTop) {
     scrollNode.scrollTo({
-      ...(opts.scrollToOptions || {}), top: 0, left: 0
+      ...(opts.scrollToOptions || {}),
+      top: 0,
+      left: 0
     })
   }
   if (opts.scrollToNode) {
     content[contentElementKey].node.scrollTo({
-      ...(opts.scrollToOptions || {}), top: 0, left: 0
+      ...(opts.scrollToOptions || {}),
+      top: 0,
+      left: 0
     })
   }
 
   if (hash) {
     const activeNode = doc.getElementById(hash)
     if (activeNode) {
-      const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - opts.scrollToOffset || 0
+      const top =
+        activeNode.getBoundingClientRect().top +
+          rootNode.scrollTop -
+          opts.scrollToOffset || 0
       scrollNode.scrollTo({
-        ...(opts.scrollToOptions || {}), top, left: 0
+        ...(opts.scrollToOptions || {}),
+        top,
+        left: 0
       })
     }
   }
 
   // trigger `on.routeChanged`
-  triggerEventOn('routeChanged', element, opts)
+  await triggerEventOn('routeChanged', element, opts)
 }
 
 export default router

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/router",
-  "version": "2.5.190",
+  "version": "3.0.0",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -22,10 +22,10 @@
     "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.190",
-    "@domql/utils": "^2.5.187"
+    "@domql/event": "^3.0.0",
+    "@domql/utils": "^3.0.0"
   },
-  "gitHead": "c4e06a81317c6d43c070d9ad93bbaeba24b3bb3b",
+  "gitHead": "bcbdc271a602b958de6a60ab387ea7715a935dc1",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }