@hybridly/core 0.1.0-alpha.9 → 0.2.0

package/dist/index.cjs

@@ -214,18 +214,6 @@ function sameUrls(...hrefs) {
   }
   return false;
 }
-function sameHashes(...hrefs) {
-  if (hrefs.length < 2) {
-    return true;
-  }
-  try {
-    return hrefs.every((href) => {
-      return makeUrl(href).toJSON() === makeUrl(hrefs.at(0)).toJSON();
-    });
-  } catch {
-  }
-  return false;
-}
 function fillHash(currentUrl, targetUrl) {
   currentUrl = makeUrl(currentUrl);
   targetUrl = makeUrl(targetUrl);
@@ -253,10 +241,12 @@ function setHistoryState(options = {}) {
     throw error;
   }
 }
-function getHistoryState(key) {
-  const context = getRouterContext();
-  const data = context.serializer.unserialize(window.history.state);
-  return key ? data?.state?.[key] : data?.state;
+function getHistoryState() {
+  return getRouterContext().serializer.unserialize(window.history.state);
+}
+function getHistoryMemo(key) {
+  const state = getHistoryState();
+  return key ? state?.memo?.[key] : state?.memo;
 }
 async function registerEventListeners() {
   const context = getRouterContext();
@@ -302,10 +292,17 @@ function isBackForwardNavigation() {
   return window.performance?.getEntriesByType("navigation").at(0)?.type === "back_forward";
 }
 async function handleBackForwardNavigation() {
-  utils.debug.router("Handling a back/forward navigation.");
-  window.history.state.version = getRouterContext().version;
+  utils.debug.router("Handling a back/forward navigation from an external URL.");
+  const context = getRouterContext();
+  const state = getHistoryState();
+  if (!state) {
+    throw new Error("Tried to handling a back/forward navigation, but there was no state in the history. This should not happen.");
+  }
   await navigate({
-    payload: window.history.state,
+    payload: {
+      ...state,
+      version: context.version
+    },
     preserveScroll: true,
     preserveState: false,
     updateHistoryState: false,
@@ -315,16 +312,13 @@ async function handleBackForwardNavigation() {
 function remember(key, value) {
   utils.debug.history(`Remembering key "${key}" with value`, value);
   setContext({
-    state: {
-      ...getHistoryState(),
+    memo: {
+      ...getHistoryMemo(),
       [key]: value
     }
   }, { propagate: false });
   setHistoryState({ replace: true });
 }
-function getKeyFromHistory(key) {
-  return getHistoryState(key);
-}
 function serializeContext(context) {
   return context.serializer.serialize({
     url: context.url,
@@ -332,7 +326,7 @@ function serializeContext(context) {
     view: context.view,
     dialog: context.dialog,
     scrollRegions: context.scrollRegions,
-    state: context.state
+    memo: context.memo
   });
 }
 function createSerializer(options) {
@@ -341,10 +335,12 @@ function createSerializer(options) {
   }
   return {
     serialize: (data) => {
+      utils.debug.history("Serializing data.", data);
       return superjson.stringify(data);
     },
     unserialize: (data) => {
       if (!data) {
+        utils.debug.history("No data to unserialize.");
         return;
       }
       return superjson.parse(data);
@@ -493,7 +489,7 @@ async function initializeContext(options) {
     axios: options.axios ?? axios__default.create(),
     routing: options.routing,
     hooks: {},
-    state: {}
+    memo: {}
   };
   await runHooks("initialized", {}, state.context);
   return getInternalRouterContext();
@@ -603,7 +599,7 @@ const router = {
     close: (options) => closeDialog(options)
   },
   history: {
-    get: (key) => getKeyFromHistory(key),
+    get: (key) => getHistoryMemo(key),
     remember: (key, value) => remember(key, value)
   }
 };
@@ -718,7 +714,7 @@ async function performHybridNavigation(options) {
       preserveScroll: options.preserveScroll,
       preserveState: options.preserveState,
       preserveUrl: options.preserveUrl,
-      replace: options.replace === true || sameHashes(payload.url, window.location.href) || options.preserveUrl
+      replace: options.replace === true || options.preserveUrl
     });
     if (Object.keys(context.view.properties.errors ?? {}).length > 0) {
       const errors = (() => {
@@ -804,9 +800,9 @@ async function navigate(options) {
   const shouldPreserveScroll = evaluateConditionalOption(options.preserveScroll);
   const shouldReplaceHistory = evaluateConditionalOption(options.replace);
   const shouldReplaceUrl = evaluateConditionalOption(options.preserveUrl);
-  if (shouldPreserveState && getHistoryState() && options.payload.view.component === context.view.component) {
-    utils.debug.history("Setting the history from this entry into the context.");
-    setContext({ state: getHistoryState() });
+  if (shouldPreserveState && getHistoryMemo() && options.payload.view.component === context.view.component) {
+    utils.debug.history("Setting the memo from this history entry into the current context.");
+    setContext({ memo: getHistoryMemo() });
   }
   if (shouldReplaceUrl) {
     utils.debug.router(`Preserving the current URL (${context.url}) instead of navigating to ${options.payload.url}`);
@@ -814,7 +810,7 @@ async function navigate(options) {
   }
   setContext({
     ...options.payload,
-    state: {}
+    memo: {}
   });
   if (options.updateHistoryState !== false) {
     utils.debug.router(`Target URL is ${context.url}, current window URL is ${window.location.href}.`, { shouldReplaceHistory });
@@ -825,7 +821,7 @@ async function navigate(options) {
   await context.adapter.onViewSwap({
     component: viewComponent,
     dialog: context.dialog,
-    properties: options.payload?.view.properties,
+    properties: options.payload?.view?.properties,
     preserveState: shouldPreserveState
   });
   if (options.isBackForward) {

package/dist/index.d.ts

@@ -355,7 +355,7 @@ interface InternalRouterContext {
     /** Scroll positions of the current page's DOM elements. */
     scrollRegions: ScrollRegion[];
     /** Arbitrary state. */
-    state: Record<string, any>;
+    memo: Record<string, any>;
     /** Currently pending navigation. */
     pendingNavigation?: PendingNavigation;
     /** History state serializer. */

package/dist/index.mjs

@@ -205,18 +205,6 @@ function sameUrls(...hrefs) {
   }
   return false;
 }
-function sameHashes(...hrefs) {
-  if (hrefs.length < 2) {
-    return true;
-  }
-  try {
-    return hrefs.every((href) => {
-      return makeUrl(href).toJSON() === makeUrl(hrefs.at(0)).toJSON();
-    });
-  } catch {
-  }
-  return false;
-}
 function fillHash(currentUrl, targetUrl) {
   currentUrl = makeUrl(currentUrl);
   targetUrl = makeUrl(targetUrl);
@@ -244,10 +232,12 @@ function setHistoryState(options = {}) {
     throw error;
   }
 }
-function getHistoryState(key) {
-  const context = getRouterContext();
-  const data = context.serializer.unserialize(window.history.state);
-  return key ? data?.state?.[key] : data?.state;
+function getHistoryState() {
+  return getRouterContext().serializer.unserialize(window.history.state);
+}
+function getHistoryMemo(key) {
+  const state = getHistoryState();
+  return key ? state?.memo?.[key] : state?.memo;
 }
 async function registerEventListeners() {
   const context = getRouterContext();
@@ -293,10 +283,17 @@ function isBackForwardNavigation() {
   return window.performance?.getEntriesByType("navigation").at(0)?.type === "back_forward";
 }
 async function handleBackForwardNavigation() {
-  debug.router("Handling a back/forward navigation.");
-  window.history.state.version = getRouterContext().version;
+  debug.router("Handling a back/forward navigation from an external URL.");
+  const context = getRouterContext();
+  const state = getHistoryState();
+  if (!state) {
+    throw new Error("Tried to handling a back/forward navigation, but there was no state in the history. This should not happen.");
+  }
   await navigate({
-    payload: window.history.state,
+    payload: {
+      ...state,
+      version: context.version
+    },
     preserveScroll: true,
     preserveState: false,
     updateHistoryState: false,
@@ -306,16 +303,13 @@ async function handleBackForwardNavigation() {
 function remember(key, value) {
   debug.history(`Remembering key "${key}" with value`, value);
   setContext({
-    state: {
-      ...getHistoryState(),
+    memo: {
+      ...getHistoryMemo(),
       [key]: value
     }
   }, { propagate: false });
   setHistoryState({ replace: true });
 }
-function getKeyFromHistory(key) {
-  return getHistoryState(key);
-}
 function serializeContext(context) {
   return context.serializer.serialize({
     url: context.url,
@@ -323,7 +317,7 @@ function serializeContext(context) {
     view: context.view,
     dialog: context.dialog,
     scrollRegions: context.scrollRegions,
-    state: context.state
+    memo: context.memo
   });
 }
 function createSerializer(options) {
@@ -332,10 +326,12 @@ function createSerializer(options) {
   }
   return {
     serialize: (data) => {
+      debug.history("Serializing data.", data);
       return stringify(data);
     },
     unserialize: (data) => {
       if (!data) {
+        debug.history("No data to unserialize.");
         return;
       }
       return parse(data);
@@ -484,7 +480,7 @@ async function initializeContext(options) {
     axios: options.axios ?? axios.create(),
     routing: options.routing,
     hooks: {},
-    state: {}
+    memo: {}
   };
   await runHooks("initialized", {}, state.context);
   return getInternalRouterContext();
@@ -594,7 +590,7 @@ const router = {
     close: (options) => closeDialog(options)
   },
   history: {
-    get: (key) => getKeyFromHistory(key),
+    get: (key) => getHistoryMemo(key),
     remember: (key, value) => remember(key, value)
   }
 };
@@ -709,7 +705,7 @@ async function performHybridNavigation(options) {
       preserveScroll: options.preserveScroll,
       preserveState: options.preserveState,
       preserveUrl: options.preserveUrl,
-      replace: options.replace === true || sameHashes(payload.url, window.location.href) || options.preserveUrl
+      replace: options.replace === true || options.preserveUrl
     });
     if (Object.keys(context.view.properties.errors ?? {}).length > 0) {
       const errors = (() => {
@@ -795,9 +791,9 @@ async function navigate(options) {
   const shouldPreserveScroll = evaluateConditionalOption(options.preserveScroll);
   const shouldReplaceHistory = evaluateConditionalOption(options.replace);
   const shouldReplaceUrl = evaluateConditionalOption(options.preserveUrl);
-  if (shouldPreserveState && getHistoryState() && options.payload.view.component === context.view.component) {
-    debug.history("Setting the history from this entry into the context.");
-    setContext({ state: getHistoryState() });
+  if (shouldPreserveState && getHistoryMemo() && options.payload.view.component === context.view.component) {
+    debug.history("Setting the memo from this history entry into the current context.");
+    setContext({ memo: getHistoryMemo() });
   }
   if (shouldReplaceUrl) {
     debug.router(`Preserving the current URL (${context.url}) instead of navigating to ${options.payload.url}`);
@@ -805,7 +801,7 @@ async function navigate(options) {
   }
   setContext({
     ...options.payload,
-    state: {}
+    memo: {}
   });
   if (options.updateHistoryState !== false) {
     debug.router(`Target URL is ${context.url}, current window URL is ${window.location.href}.`, { shouldReplaceHistory });
@@ -816,7 +812,7 @@ async function navigate(options) {
   await context.adapter.onViewSwap({
     component: viewComponent,
     dialog: context.dialog,
-    properties: options.payload?.view.properties,
+    properties: options.payload?.view?.properties,
     preserveState: shouldPreserveState
   });
   if (options.isBackForward) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/core",
-  "version": "0.1.0-alpha.9",
+  "version": "0.2.0",
   "description": "Core functionality of Hybridly",
   "keywords": [
     "hybridly",
@@ -38,7 +38,7 @@
   "dependencies": {
     "qs": "^6.11.1",
     "superjson": "^1.12.2",
-    "@hybridly/utils": "0.1.0-alpha.9"
+    "@hybridly/utils": "0.2.0"
   },
   "devDependencies": {
     "defu": "^6.1.2"