crelte 0.4.0 → 0.4.2

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

@@ -1 +1 @@
-{"version":3,"file":"InnerRouter.d.ts","sourceRoot":"","sources":["../../src/routing/InnerRouter.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,OAAO,EAAE,EAAa,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd;;;;;OAKG;IACH,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAC7D,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEpC,OAAO,CAAC,qBAAqB,CAAa;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe;IAkB3D;;OAEG;IACH,UAAU;IAgBV;;OAEG;IACH,UAAU;IAEV;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI;IAsCxD;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAKjC;;;;;;OAMG;IACH,eAAe,CACd,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EACtC,IAAI,GAAE,cAAmB,GACvB,OAAO;IA0BV;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAgCjC,MAAM;IAoGN;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IA4CjB;;;;;;;OAOG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IAuBjB;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO;IAuBpB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO;IAW9C,QAAQ,CAAC,GAAG,EAAE,OAAO;CAsErB"}
+{"version":3,"file":"InnerRouter.d.ts","sourceRoot":"","sources":["../../src/routing/InnerRouter.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AAC/D,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,OAAO,EAAE,EAAa,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd;;;;;OAKG;IACH,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAC7D,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEpC,OAAO,CAAC,qBAAqB,CAAa;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe;IAkB3D;;OAEG;IACH,UAAU;IAgBV;;OAEG;IACH,UAAU;IAEV;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI;IAsCxD;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAKjC;;;;;;OAMG;IACH,eAAe,CACd,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EACtC,IAAI,GAAE,cAAmB,GACvB,OAAO;IA0BV;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAcjC,MAAM;IAiGN;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IA6CjB;;;;;;;OAOG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IAuBjB;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO;IAuBpB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO;IAW9C,QAAQ,CAAC,GAAG,EAAE,OAAO;CAsErB"}

package/dist/routing/InnerRouter.js

@@ -1,4 +1,4 @@
-import Site from './Site.js';
+import Site, { siteFromUrl } from './Site.js';
 import { ClientHistory, ServerHistory } from './History.js';
 import Request, { isRequest } from './Request.js';
 import Route from './Route.js';
@@ -155,23 +155,7 @@ export default class InnerRouter {
         // strip stuff we dont need from url
         const route = new Route(fullUrl, null);
         const url = route.url;
-        let site = null;
-        // get the site which matches the url the most
-        for (const s of this.sites) {
-            const siteUri = s.uri;
-            // make sure the start of the url matches
-            if (url.host !== s.url.host || !url.pathname.startsWith(siteUri)) {
-                continue;
-            }
-            // make sure that after the base url a slash follows or nothing
-            const uri = url.pathname.substring(siteUri.length);
-            if (uri.length > 0 && !uri.startsWith('/'))
-                continue;
-            /// make sure we get the most matched site
-            if (site && site.uri.length > siteUri.length)
-                continue;
-            site = s;
-        }
+        const site = siteFromUrl(url, this.sites);
         // todo should we throw if we can't find a site
         // or use the site which matches the language
         route.site = site ?? this.defaultSite();
@@ -192,12 +176,8 @@ export default class InnerRouter {
             e.preventDefault();
             const req = this.targetToRequest(link.href, { origin: 'click' });
             const routeEq = this.route && this.route.eqUrl(req) && this.route.eqSearch(req);
-            // the route is the same don't do anything
-            // or maybe scroll the page to the hash? todo
-            if (routeEq && this.route?.eqHash(req))
-                return;
-            // this means the hash did not match, so we wan't to just scroll but not load
-            // data
+            // this means the route is the same maybe with a different hash
+            // so it is not necessary to load the data again
             if (routeEq) {
                 req.disableLoadData = true;
             }
@@ -278,6 +258,7 @@ export default class InnerRouter {
             throw new Error('Do not use open with push or replace');
         }
         const current = this.route;
+        // store scrollY
         if (current) {
             // if the scrollY would still be updated we clear the timeout
             // since we should have the latest scrollY

package/dist/routing/Site.d.ts

@@ -44,4 +44,5 @@ export default class Site {
      */
     get uri(): string;
 }
+export declare function siteFromUrl(url: URL, sites: Site[]): Site | null;
 //# sourceMappingURL=Site.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Site.d.ts","sourceRoot":"","sources":["../../src/routing/Site.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACxB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,eAAe;IAShC;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;CACD"}
+{"version":3,"file":"Site.d.ts","sourceRoot":"","sources":["../../src/routing/Site.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACxB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,eAAe;IAShC;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;CACD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,CAsBhE"}

package/dist/routing/Site.js

@@ -46,3 +46,23 @@ export default class Site {
         return trimSlashEnd(this.url.pathname);
     }
 }
+export function siteFromUrl(url, sites) {
+    let site = null;
+    // get the site which matches the url the most
+    for (const s of sites) {
+        const siteUri = s.uri;
+        // make sure the start of the url matches
+        if (url.host !== s.url.host || !url.pathname.startsWith(siteUri)) {
+            continue;
+        }
+        // make sure that after the base url a slash follows or nothing
+        const uri = url.pathname.substring(siteUri.length);
+        if (uri.length > 0 && !uri.startsWith('/'))
+            continue;
+        /// make sure we get the most matched site
+        if (site && site.uri.length > siteUri.length)
+            continue;
+        site = s;
+    }
+    return site;
+}

package/dist/routing/internal.d.ts

@@ -0,0 +1,3 @@
+import { siteFromUrl } from './Site.js';
+export { siteFromUrl };
+//# sourceMappingURL=internal.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/routing/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/routing/internal.js

@@ -0,0 +1,2 @@
+import { siteFromUrl } from './Site.js';
+export { siteFromUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "crelte",
-	"version": "0.4.0",
+	"version": "0.4.2",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {
@@ -44,6 +44,10 @@
 			"types": "./dist/routing/index.d.ts",
 			"default": "./dist/routing/index.js"
 		},
+		"./routing/internal": {
+			"types": "./dist/routing/internal.d.ts",
+			"default": "./dist/routing/internal.js"
+		},
 		"./entry": {
 			"types": "./dist/entry/index.d.ts",
 			"default": "./dist/entry/index.js"

package/src/routing/InnerRouter.ts

@@ -1,4 +1,4 @@
-import Site, { SiteFromGraphQl } from './Site.js';
+import Site, { SiteFromGraphQl, siteFromUrl } from './Site.js';
 import History from './History.js';
 import { ClientHistory, ServerHistory } from './History.js';
 import Request, { isRequest, RequestOptions } from './Request.js';
@@ -184,25 +184,7 @@ export default class InnerRouter {
 		const route = new Route(fullUrl, null!);
 		const url = route.url;
 
-		let site: Site | null = null;
-		// get the site which matches the url the most
-		for (const s of this.sites) {
-			const siteUri = s.uri;
-
-			// make sure the start of the url matches
-			if (url.host !== s.url.host || !url.pathname.startsWith(siteUri)) {
-				continue;
-			}
-
-			// make sure that after the base url a slash follows or nothing
-			const uri = url.pathname.substring(siteUri.length);
-			if (uri.length > 0 && !uri.startsWith('/')) continue;
-
-			/// make sure we get the most matched site
-			if (site && site.uri.length > siteUri.length) continue;
-
-			site = s;
-		}
+		const site = siteFromUrl(url, this.sites);
 
 		// todo should we throw if we can't find a site
 		// or use the site which matches the language
@@ -226,12 +208,9 @@ export default class InnerRouter {
 			const req = this.targetToRequest(link.href, { origin: 'click' });
 			const routeEq =
 				this.route && this.route.eqUrl(req) && this.route.eqSearch(req);
-			// the route is the same don't do anything
-			// or maybe scroll the page to the hash? todo
-			if (routeEq && this.route?.eqHash(req)) return;
 
-			// this means the hash did not match, so we wan't to just scroll but not load
-			// data
+			// this means the route is the same maybe with a different hash
+			// so it is not necessary to load the data again
 			if (routeEq) {
 				req.disableLoadData = true;
 			}
@@ -327,6 +306,7 @@ export default class InnerRouter {
 		}
 
 		const current = this.route;
+		// store scrollY
 		if (current) {
 			// if the scrollY would still be updated we clear the timeout
 			// since we should have the latest scrollY

package/src/routing/Site.ts

@@ -63,3 +63,27 @@ export default class Site {
 		return trimSlashEnd(this.url.pathname);
 	}
 }
+
+export function siteFromUrl(url: URL, sites: Site[]): Site | null {
+	let site: Site | null = null;
+	// get the site which matches the url the most
+	for (const s of sites) {
+		const siteUri = s.uri;
+
+		// make sure the start of the url matches
+		if (url.host !== s.url.host || !url.pathname.startsWith(siteUri)) {
+			continue;
+		}
+
+		// make sure that after the base url a slash follows or nothing
+		const uri = url.pathname.substring(siteUri.length);
+		if (uri.length > 0 && !uri.startsWith('/')) continue;
+
+		/// make sure we get the most matched site
+		if (site && site.uri.length > siteUri.length) continue;
+
+		site = s;
+	}
+
+	return site;
+}

package/src/routing/internal.ts

@@ -0,0 +1,3 @@
+import { siteFromUrl } from './Site.js';
+
+export { siteFromUrl };