tungsten 0.6.2 → 0.6.3

package/dist/.build-complete

@@ -1 +1 @@
-1789702483581
+1789711902548

package/dist/Instance/Instance.d.ts

@@ -14,6 +14,7 @@ type DisposableComponent = {
     __delete: () => void;
     __deleted: () => void;
 };
+export type NavigationCause = 'navigate' | 'history';
 export declare class Instance {
     location: string;
     reqRes: ReqRes | null;
@@ -40,14 +41,18 @@ export declare class Instance {
     } | undefined;
     constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes, routes: Routes, internalStore: InternalStore, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: GlobalData, matchedRouteInfo: MatchedRouteInfo, runtimeContext?: ClientRuntimeContext);
     routeKeyToUrl: (routeKey: RouteKey) => string;
-    urlToRouteKey: (pathname: string) => RouteKey;
+    urlToLocation: (url: {
+        pathname: string;
+        search: string;
+    }) => RouteKey;
     getRoutes: () => Routes;
     updateLocation: (location: string) => void;
-    goto: (path: RouteKey, { pushHistory }?: {
-        pushHistory?: boolean;
+    goto: (path: RouteKey, { cause }?: {
+        cause?: NavigationCause;
     }) => Promise<void>;
     redirect: (url: string, code?: RedirectCode) => void;
     httpTo: (url: string) => void;
+    httpReload: () => void;
     setDefaultTitle: (defaultTitle: string) => void;
     setTitle: (title: string) => void;
     setTitleToDefault: () => void;

package/dist/Instance/Instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"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"}

package/dist/Instance/Instance.js

@@ -4,7 +4,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { isClient } from '../isClient.js';
 import { routing } from "../Servers/routing.js";
 import { RoutingRedirect } from '../routing/RoutingRedirect.js';
-import { routeKeyToUrl, urlToRouteKey } from '../routing/routeUrl.js';
+import { routeKeyToUrl, urlToLocation } from '../routing/routeUrl.js';
 import { isProd } from '../isProd.js';
 import { WebRedirect } from '../routing/WebRedirect.js';
 import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
@@ -52,9 +52,9 @@ export class Instance {
       return routeKeyToUrl(routeKey, this.config.siteBasePath, isProd && this.config.staticSite);
     });
     // unchecked: goto's routing() does the pattern matching and 404 fallback
-    _defineProperty(this, "urlToRouteKey", pathname => {
-      const routeKey = urlToRouteKey(pathname, this.config.siteBasePath, isProd && this.config.staticSite);
-      return routeKey; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+    _defineProperty(this, "urlToLocation", url => {
+      const location = urlToLocation(url, this.config.siteBasePath, isProd && this.config.staticSite);
+      return location; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     });
     _defineProperty(this, "getRoutes", () => {
       return typeof this.appRoutes === 'function' ? this.appRoutes(this.reqRes) : this.appRoutes;
@@ -66,18 +66,19 @@ export class Instance {
       this.location = location;
       this.internalStore.location.set(location);
     });
+    // 'history': the browser has already moved to path (back/forward)
     _defineProperty(this, "goto", async (path, {
-      pushHistory = true
+      cause = 'navigate'
     } = {}) => {
       if (isServer) {
         this.redirect(this.routeKeyToUrl(path));
         return;
       }
-      // immediate redirect
-      // 
+      // a history move within the page (a #fragment): the browser has already scrolled
+      if (cause === 'history' && path === this.location) return;
       if (!this.config.clientSideNav) {
         // if clientSideNav is off, these navs should turn into requests to the server
-        this.httpTo(this.routeKeyToUrl(path));
+        if (cause === 'history') this.httpReload();else this.httpTo(this.routeKeyToUrl(path));
         return;
       }
       // the store types these two readonly for everyone else; goto() is what owns them
@@ -132,7 +133,7 @@ export class Instance {
             this.goto(matchedRouteInfo.content[$props].to);
             return;
           } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
-            console.log('Content is a WebRedirectComponent - perform a hard redirect');
+            //console.log('Content is a WebRedirectComponent - perform a hard redirect')
             this.redirect(matchedRouteInfo.content[$props].to);
             return;
           }
@@ -143,7 +144,7 @@ export class Instance {
         //console.log('location', location) 
         //console.log('final dest', this.config.siteBasePath + location)
         this.matchedRouteInfo = matchedRouteInfo;
-        if (isClient && pushHistory) {
+        if (isClient && cause === 'navigate') {
           const runtimeWindow = this.runtimeContext?.window ?? window;
           runtimeWindow.history.pushState(null, '', this.routeKeyToUrl(path));
         }
@@ -186,6 +187,13 @@ export class Instance {
       const runtimeWindow = this.runtimeContext?.window ?? window;
       runtimeWindow.location.assign(url);
     });
+    _defineProperty(this, "httpReload", () => {
+      if (!isClient) {
+        throwError('httpReload', 'Cannot modify window location on the server');
+      }
+      const runtimeWindow = this.runtimeContext?.window ?? window;
+      runtimeWindow.location.reload();
+    });
     _defineProperty(this, "setDefaultTitle", defaultTitle => {
       this.defaultTitle = defaultTitle;
     });
@@ -256,9 +264,8 @@ export class Instance {
       runtimeWindow.addEventListener('popstate', event => {
         //console.log('popstate', window.location.pathname)
         //this.updateLocation(window.location.pathname)
-        const newLocation = this.urlToRouteKey(runtimeWindow.location.pathname);
-        void this.goto(newLocation, {
-          pushHistory: false
+        void this.goto(this.urlToLocation(runtimeWindow.location), {
+          cause: 'history'
         });
       });
     }

package/dist/hydrate/hydrate.js

@@ -28,7 +28,7 @@ import { Default404 } from "../routing/Default404.js";
 import { MatchedRoute } from '../routing/MatchedRoute.js';
 import { isDev } from '../isDev.js';
 import { isProd } from '../isProd.js';
-import { urlToRouteKey } from '../routing/routeUrl.js';
+import { urlToLocation } from '../routing/routeUrl.js';
 import { warn } from '../appOutput.js';
 import { reconcileHydratedAttributes } from './reconcileHydratedAttributes.js';
 import { markOptionSelected } from '../markOptionSelected.js';
@@ -60,7 +60,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   // happens next (a read of its value throws below). Rendered again at the end, for the count.
   if (isDev) renderDocInitErrorBanner();
   //console.log('hydration global data ', __tungsten_global_data__)
-  const location = urlToRouteKey(window.location.pathname, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
+  const location = urlToLocation(window.location, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
   const routes = typeof appRoutes === 'function' ? appRoutes(null) : appRoutes;
   const matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
   const globalData = __tungsten_global_data__;

package/dist/routing/routeUrl.d.ts

@@ -1,4 +1,8 @@
 import type { SiteBasePath } from '../render/HeadData.js';
 export declare function routeKeyToUrl(routeKey: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
 export declare function urlToRouteKey(pathname: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
+export declare function urlToLocation(url: {
+    pathname: string;
+    search: string;
+}, siteBasePath: SiteBasePath, staticFiles: boolean): string;
 //# sourceMappingURL=routeUrl.d.ts.map

package/dist/routing/routeUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeUrl.d.ts","sourceRoot":"","sources":["../../src/routing/routeUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CASxG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAWxG"}
+{"version":3,"file":"routeUrl.d.ts","sourceRoot":"","sources":["../../src/routing/routeUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CASxG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAWxG;AAGD,wBAAgB,aAAa,CACzB,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAC5F,MAAM,CAER"}

package/dist/routing/routeUrl.js

@@ -20,4 +20,8 @@ export function urlToRouteKey(pathname, siteBasePath, staticFiles) {
     if (path.endsWith('/index.html')) path = path.slice(0, -'index.html'.length);else if (path.endsWith('.html')) path = path.slice(0, -'.html'.length);
   }
   return path;
+}
+// the app's location for a browser URL: route path plus query, as the server sees it (no fragment)
+export function urlToLocation(url, siteBasePath, staticFiles) {
+  return urlToRouteKey(url.pathname, siteBasePath, staticFiles) + url.search;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "",
   "type": "module",
   "bin": {