@hybridly/core 0.7.18 → 0.8.0

package/dist/index.cjs

@@ -77,7 +77,7 @@ async function runPluginHooks(hook, ...args) {
   await forEachPlugin(async (plugin) => {
     if (plugin[hook]) {
       utils.debug.plugin(plugin.name, `Calling "${hook}" hook.`);
-      result && (result = await plugin[hook]?.(...args) !== false);
+      result &&= await plugin[hook]?.(...args) !== false;
     }
   });
   return result;
@@ -404,7 +404,7 @@ function urlMatchesRoute(fullUrl, name, routeParameters) {
   });
 }
 function generateRouteFromName(name, parameters, absolute, shouldThrow) {
-  const url = getUrlFromName(name, parameters, shouldThrow);
+  const url = getUrlFromName(name, parameters);
   return absolute === false ? url.toString().replace(url.origin, "") : url.toString();
 }
 function getNameFromUrl(url, parameters) {
@@ -417,7 +417,7 @@ function getNameFromUrl(url, parameters) {
 function getUrlFromName(name, parameters, shouldThrow) {
   const routing = getRouting();
   const definition = getRouteDefinition(name);
-  const transforms = getRouteTransformable(name, parameters, shouldThrow);
+  const transforms = getRouteTransformable(name, parameters);
   const url = makeUrl(routing.url, (url2) => ({
     hostname: definition.domain || url2.hostname,
     port: routing.port?.toString() || url2.port,
@@ -465,9 +465,6 @@ function getRouteTransformable(routeName, routeParameters, shouldThrow) {
     if (optional) {
       return "";
     }
-    if (shouldThrow === false) {
-      return "";
-    }
     throw new MissingRouteParameter(parameterName, routeName);
   };
   const path = definition.uri.replace(/{([^}?]+)(\??)}/g, replaceParameter);
@@ -950,13 +947,12 @@ function isHybridResponse(response) {
   return !!response?.headers[HYBRIDLY_HEADER];
 }
 async function navigate(options) {
-  var _a;
   const context = getRouterContext();
-  options.hasDialog ?? (options.hasDialog = !!options.payload?.dialog);
+  options.hasDialog ??= !!options.payload?.dialog;
   utils.debug.router("Making an internal navigation:", { context, options });
   await runHooks("navigating", {}, options, context);
-  options.payload ?? (options.payload = payloadFromContext());
-  (_a = options.payload).view ?? (_a.view = payloadFromContext().view);
+  options.payload ??= payloadFromContext();
+  options.payload.view ??= payloadFromContext().view;
   function evaluateConditionalOption(option) {
     return typeof option === "function" ? option(options) : option;
   }
@@ -1089,7 +1085,7 @@ async function performLocalNavigation(targetUrl, options) {
       url,
       view: {
         component: options?.component ?? context.view.component,
-        properties: options?.properties ?? {},
+        properties: options?.properties ?? context.view.properties,
         deferred: []
       }
     }

package/dist/index.d.cts

@@ -277,7 +277,7 @@ interface Router {
     /** Determines if the given route name and parameters matches the current route. */
     matches: <T extends RouteName>(name: T, parameters?: RouteParameters<T>) => boolean;
     /** Gets the current route name. Returns `undefined` is unknown. */
-    current: () => string | undefined;
+    current: () => RouteName | undefined;
     /** Access the dialog router. */
     dialog: DialogRouter;
     /** Access the history state. */

package/dist/index.d.mts

@@ -277,7 +277,7 @@ interface Router {
     /** Determines if the given route name and parameters matches the current route. */
     matches: <T extends RouteName>(name: T, parameters?: RouteParameters<T>) => boolean;
     /** Gets the current route name. Returns `undefined` is unknown. */
-    current: () => string | undefined;
+    current: () => RouteName | undefined;
     /** Access the dialog router. */
     dialog: DialogRouter;
     /** Access the history state. */

package/dist/index.d.ts

@@ -277,7 +277,7 @@ interface Router {
     /** Determines if the given route name and parameters matches the current route. */
     matches: <T extends RouteName>(name: T, parameters?: RouteParameters<T>) => boolean;
     /** Gets the current route name. Returns `undefined` is unknown. */
-    current: () => string | undefined;
+    current: () => RouteName | undefined;
     /** Access the dialog router. */
     dialog: DialogRouter;
     /** Access the history state. */

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { debug, merge, removeTrailingSlash, debounce, random, hasFiles, objectToFormData, match, showResponseErrorModal, when } from '@hybridly/utils';
 import qs from 'qs';
 import axios from 'axios';
-import { stringify, parse } from 'superjson';
+import { parse, stringify } from 'superjson';
 
 const STORAGE_EXTERNAL_KEY = "hybridly:external";
 const HYBRIDLY_HEADER = "x-hybrid";
@@ -70,7 +70,7 @@ async function runPluginHooks(hook, ...args) {
   await forEachPlugin(async (plugin) => {
     if (plugin[hook]) {
       debug.plugin(plugin.name, `Calling "${hook}" hook.`);
-      result && (result = await plugin[hook]?.(...args) !== false);
+      result &&= await plugin[hook]?.(...args) !== false;
     }
   });
   return result;
@@ -397,7 +397,7 @@ function urlMatchesRoute(fullUrl, name, routeParameters) {
   });
 }
 function generateRouteFromName(name, parameters, absolute, shouldThrow) {
-  const url = getUrlFromName(name, parameters, shouldThrow);
+  const url = getUrlFromName(name, parameters);
   return absolute === false ? url.toString().replace(url.origin, "") : url.toString();
 }
 function getNameFromUrl(url, parameters) {
@@ -410,7 +410,7 @@ function getNameFromUrl(url, parameters) {
 function getUrlFromName(name, parameters, shouldThrow) {
   const routing = getRouting();
   const definition = getRouteDefinition(name);
-  const transforms = getRouteTransformable(name, parameters, shouldThrow);
+  const transforms = getRouteTransformable(name, parameters);
   const url = makeUrl(routing.url, (url2) => ({
     hostname: definition.domain || url2.hostname,
     port: routing.port?.toString() || url2.port,
@@ -458,9 +458,6 @@ function getRouteTransformable(routeName, routeParameters, shouldThrow) {
     if (optional) {
       return "";
     }
-    if (shouldThrow === false) {
-      return "";
-    }
     throw new MissingRouteParameter(parameterName, routeName);
   };
   const path = definition.uri.replace(/{([^}?]+)(\??)}/g, replaceParameter);
@@ -943,13 +940,12 @@ function isHybridResponse(response) {
   return !!response?.headers[HYBRIDLY_HEADER];
 }
 async function navigate(options) {
-  var _a;
   const context = getRouterContext();
-  options.hasDialog ?? (options.hasDialog = !!options.payload?.dialog);
+  options.hasDialog ??= !!options.payload?.dialog;
   debug.router("Making an internal navigation:", { context, options });
   await runHooks("navigating", {}, options, context);
-  options.payload ?? (options.payload = payloadFromContext());
-  (_a = options.payload).view ?? (_a.view = payloadFromContext().view);
+  options.payload ??= payloadFromContext();
+  options.payload.view ??= payloadFromContext().view;
   function evaluateConditionalOption(option) {
     return typeof option === "function" ? option(options) : option;
   }
@@ -1082,7 +1078,7 @@ async function performLocalNavigation(targetUrl, options) {
       url,
       view: {
         component: options?.component ?? context.view.component,
-        properties: options?.properties ?? {},
+        properties: options?.properties ?? context.view.properties,
         deferred: []
       }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hybridly/core",
   "type": "module",
-  "version": "0.7.18",
+  "version": "0.8.0",
   "description": "Core functionality of Hybridly",
   "author": "Enzo Innocenzi <enzo@innocenzi.dev>",
   "license": "MIT",
@@ -41,9 +41,9 @@
     "axios": "^1.7.2"
   },
   "dependencies": {
-    "qs": "^6.13.0",
-    "superjson": "^2.2.1",
-    "@hybridly/utils": "0.7.18"
+    "qs": "^6.14.0",
+    "superjson": "^2.2.2",
+    "@hybridly/utils": "0.8.0"
   },
   "devDependencies": {
     "defu": "^6.1.4"