svelte-spa-history-router 2.1.2 → 2.2.0-next.0

package/README.md

@@ -184,6 +184,11 @@ store to detect URL changes (including query string or hash)
 
 ## ChangeLog
 
+### 2.1.0-next.0
+
+* [PR12](https://github.com/ykrods/svelte-spa-history-router/pull/12)
+* Refactor (changes: [2.1.2...7b7795b](https://github.com/ykrods/svelte-spa-history-router/compare/2.1.2...7b7795b2675c452a1a189d3931c0c4c9abb04c51) )
+
 ### 2.1.2 (2024-04-29)
 
 * Support types [PR10](https://github.com/ykrods/svelte-spa-history-router/pull/10)

package/{example → examples/app-svelte4}/dist/Article.js

@@ -1,11 +1,11 @@
 import { S as SvelteComponentDev, i as init, s as safe_not_equal, d as dispatch_dev, v as validate_store, r as routeParams, c as component_subscribe, a as validate_slots, l as link, g as globals, b as space, e as element, t as text, f as add_location, h as attr_dev, j as insert_dev, k as append_dev, m as set_data_dev, n as noop, o as detach_dev, p as action_destroyer, H as HtmlTag } from './main2.js';
 
-/* Article.svelte generated by Svelte v4.2.8 */
+/* src/Article.svelte generated by Svelte v4.2.17 */
 
 const { console: console_1 } = globals;
-const file = "Article.svelte";
+const file = "src/Article.svelte";
 
-// (19:4) {#if article.previous}
+// (18:4) {#if article.previous}
 function create_if_block_1(ctx) {
 	let a;
 	let t;
@@ -18,7 +18,7 @@ function create_if_block_1(ctx) {
 			a = element("a");
 			t = text("Prev");
 			attr_dev(a, "href", a_href_value = `/posts/${/*article*/ ctx[0].previous}`);
-			add_location(a, file, 18, 26, 381);
+			add_location(a, file, 17, 26, 354);
 		},
 		m: function mount(target, anchor) {
 			insert_dev(target, a, anchor);
@@ -48,14 +48,14 @@ function create_if_block_1(ctx) {
 		block,
 		id: create_if_block_1.name,
 		type: "if",
-		source: "(19:4) {#if article.previous}",
+		source: "(18:4) {#if article.previous}",
 		ctx
 	});
 
 	return block;
 }
 
-// (20:4) {#if article.next}
+// (19:4) {#if article.next}
 function create_if_block(ctx) {
 	let a;
 	let t;
@@ -68,7 +68,7 @@ function create_if_block(ctx) {
 			a = element("a");
 			t = text("Next");
 			attr_dev(a, "href", a_href_value = `/posts/${/*article*/ ctx[0].next}`);
-			add_location(a, file, 19, 22, 465);
+			add_location(a, file, 18, 22, 438);
 		},
 		m: function mount(target, anchor) {
 			insert_dev(target, a, anchor);
@@ -98,7 +98,7 @@ function create_if_block(ctx) {
 		block,
 		id: create_if_block.name,
 		type: "if",
-		source: "(20:4) {#if article.next}",
+		source: "(19:4) {#if article.next}",
 		ctx
 	});
 
@@ -135,11 +135,11 @@ function create_fragment(ctx) {
 			if (if_block0) if_block0.c();
 			t4 = space();
 			if (if_block1) if_block1.c();
-			add_location(h1, file, 15, 2, 299);
+			add_location(h1, file, 14, 2, 272);
 			html_tag.a = t3;
-			add_location(div0, file, 17, 2, 349);
+			add_location(div0, file, 16, 2, 322);
 			attr_dev(div1, "class", "article");
-			add_location(div1, file, 14, 0, 275);
+			add_location(div1, file, 13, 0, 248);
 		},
 		l: function claim(nodes) {
 			throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");

package/examples/app-svelte4/dist/Article.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Article.js","sources":["../src/Article.svelte"],"sourcesContent":["<script>\n  import { link, routeParams } from 'svelte-spa-history-router';\n\n  export let article;\n\n  $: if ($routeParams.postId) {\n    console.log($routeParams.postId);\n  };\n</script>\n\n<svelte:head>\n  <title>{ article.title }</title>\n</svelte:head>\n<div class=\"article\">\n  <h1>{article.title}</h1>\n  {@html article.html}\n  <div>\n    {#if article.previous}<a use:link href={`/posts/${article.previous}`}>Prev</a>{/if}\n    {#if article.next}<a use:link href={`/posts/${article.next}`}>Next</a>{/if}\n  </div>\n</div>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;YAiB0E,MAAI,CAAA,CAAA;AAAxB,GAAA,QAAA,CAAA,CAAA,EAAA,MAAA,EAAA,YAAA,GAAA,CAAA,OAAA,cAAA,GAAO,IAAC,QAAQ,CAAA,CAAA,CAAA,CAAA;;;;GAA5C,UAAwD,CAAA,MAAA,EAAA,CAAA,EAAA,MAAA,CAAA,CAAA;;;;;;;;;AAA5B,GAAA,IAAA,KAAA,eAAA,CAAA,IAAA,YAAA,MAAA,YAAA,GAAA,CAAA,OAAA,cAAA,GAAO,IAAC,QAAQ,CAAA,CAAA,CAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YACJ,MAAI,CAAA,CAAA;AAApB,GAAA,QAAA,CAAA,CAAA,EAAA,MAAA,EAAA,YAAA,GAAA,CAAA,OAAA,cAAA,GAAO,IAAC,IAAI,CAAA,CAAA,CAAA,CAAA;;;;GAAxC,UAAoD,CAAA,MAAA,EAAA,CAAA,EAAA,MAAA,CAAA,CAAA;;;;;;;;;AAAxB,GAAA,IAAA,KAAA,eAAA,CAAA,IAAA,YAAA,MAAA,YAAA,GAAA,CAAA,OAAA,cAAA,GAAO,IAAC,IAAI,CAAA,CAAA,CAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAJvD,CAAA,IAAA,QAAA,eAAA,GAAO,IAAC,KAAK,GAAA,EAAA,CAAA;;;;AACX,CAAA,IAAA,SAAA,eAAA,GAAO,IAAC,IAAI,GAAA,EAAA,CAAA;;;;AAJV,CAAA,QAAA,CAAA,KAAA,GAAA,WAAA,eAAA,GAAO,IAAC,KAAK,CAAA;AAMf,CAAA,IAAA,SAAA,eAAA,GAAO,IAAC,QAAQ,IAAA,iBAAA,CAAA,GAAA,CAAA,CAAA;AAChB,CAAA,IAAA,SAAA,eAAA,GAAO,IAAC,IAAI,IAAA,eAAA,CAAA,GAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GALrB,UAOM,CAAA,MAAA,EAAA,IAAA,EAAA,MAAA,CAAA,CAAA;GANJ,UAAwB,CAAA,IAAA,EAAA,EAAA,CAAA,CAAA;;;;;GAExB,UAGM,CAAA,IAAA,EAAA,IAAA,CAAA,CAAA;;;;;;AARG,GAAA,IAAA,KAAA,eAAA,CAAA,IAAA,WAAA,MAAA,WAAA,eAAA,GAAO,IAAC,KAAK,CAAA,EAAA;;;;AAGjB,GAAA,IAAA,KAAA,eAAA,CAAA,IAAA,QAAA,MAAA,QAAA,eAAA,GAAO,IAAC,KAAK,GAAA,EAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,QAAA,CAAA,CAAA;AACX,GAAA,IAAA,KAAA,eAAA,CAAA,IAAA,SAAA,MAAA,SAAA,eAAA,GAAO,IAAC,IAAI,GAAA,EAAA,CAAA,EAAA,QAAA,CAAA,CAAA,CAAA,SAAA,CAAA,CAAA;;AAEZ,GAAA,gBAAA,GAAO,IAAC,QAAQ,EAAA;;;;;;;;;;;;;AAChB,GAAA,gBAAA,GAAO,IAAC,IAAI,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAfR,OAAO,EAAA,GAAA,OAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEjB,IAAM,YAAY,CAAC,MAAM,EAAA;AACxB,IAAA,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/{example → examples/app-svelte4}/dist/Login.js

@@ -1,7 +1,7 @@
 import { S as SvelteComponentDev, i as init, s as safe_not_equal, d as dispatch_dev, v as validate_store, u as user, c as component_subscribe, a as validate_slots, q as push, e as element, b as space, f as add_location, h as attr_dev, j as insert_dev, k as append_dev, n as noop, o as detach_dev, w as set_store_value, t as text, x as listen_dev, m as set_data_dev } from './main2.js';
 
-/* Login.svelte generated by Svelte v4.2.8 */
-const file = "Login.svelte";
+/* src/Login.svelte generated by Svelte v4.2.17 */
+const file = "src/Login.svelte";
 
 // (18:2) {:else }
 function create_else_block(ctx) {
@@ -20,7 +20,7 @@ function create_else_block(ctx) {
 			button = element("button");
 			button.textContent = "logout";
 			attr_dev(button, "id", "logout");
-			add_location(button, file, 18, 26, 341);
+			add_location(button, file, 18, 26, 352);
 		},
 		m: function mount(target, anchor) {
 			insert_dev(target, t0, anchor);
@@ -29,7 +29,7 @@ function create_else_block(ctx) {
 			insert_dev(target, button, anchor);
 
 			if (!mounted) {
-				dispose = listen_dev(button, "click", /*logout*/ ctx[2], false, false, false, false);
+				dispose = listen_dev(button, "click", /*logout*/ ctx[2], false);
 				mounted = true;
 			}
 		},
@@ -71,13 +71,13 @@ function create_if_block(ctx) {
 			button = element("button");
 			button.textContent = "login";
 			attr_dev(button, "id", "login");
-			add_location(button, file, 16, 2, 253);
+			add_location(button, file, 16, 2, 264);
 		},
 		m: function mount(target, anchor) {
 			insert_dev(target, button, anchor);
 
 			if (!mounted) {
-				dispose = listen_dev(button, "click", /*login*/ ctx[1], false, false, false, false);
+				dispose = listen_dev(button, "click", /*login*/ ctx[1], false);
 				mounted = true;
 			}
 		},
@@ -123,9 +123,9 @@ function create_fragment(ctx) {
 			h1.textContent = "Login";
 			t1 = space();
 			if_block.c();
-			add_location(h1, file, 14, 2, 212);
+			add_location(h1, file, 14, 2, 223);
 			attr_dev(div, "class", "login");
-			add_location(div, file, 13, 0, 190);
+			add_location(div, file, 13, 0, 201);
 		},
 		l: function claim(nodes) {
 			throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");

package/examples/app-svelte4/dist/Login.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Login.js","sources":["../src/Login.svelte"],"sourcesContent":["<script>\n  import { push } from 'svelte-spa-history-router';\n\n  import { user } from './store.js';\n\n  function login() {\n    $user = \"admin\";\n  }\n  function logout() {\n    $user = null;\n  }\n</script>\n\n<div class=\"login\">\n  <h1>Login</h1>\n  {#if $user === null }\n  <button id=\"login\" on:click={login}>login</button>\n  {:else }\n  current user: { $user } <button id=\"logout\" on:click={logout}>logout</button>\n  {/if }\n</div>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;aAiBU,gBACM,CAAA,CAAA;uBAAE,GAAK,CAAA,CAAA,CAAA,CAAA,CAAA;;;;;;;;;;;GAAG,UAAqD,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,CAAA;;;qDAAvB,GAAM,CAAA,CAAA,CAAA,EAAA,KAAA,CAAA,CAAA;;;;;uDAA5C,GAAK,CAAA,CAAA,CAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAFrB,UAAkD,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,CAAA;;;oDAArB,GAAK,CAAA,CAAA,CAAA,EAAA,KAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAD7B,EAAA,cAAA,GAAK,QAAK,IAAI,EAAA,OAAA,eAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;GAFrB,UAOM,CAAA,MAAA,EAAA,GAAA,EAAA,MAAA,CAAA,CAAA;GANJ,UAAc,CAAA,GAAA,EAAA,EAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UATL,KAAK,GAAA;AACZ,EAAA,eAAA,CAAA,IAAA,EAAA,KAAK,GAAG,OAAO,EAAA,KAAA,CAAA,CAAA;;;UAER,MAAM,GAAA;AACb,EAAA,eAAA,CAAA,IAAA,EAAA,KAAK,GAAG,IAAI,EAAA,KAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/{example → examples/app-svelte4}/dist/Query.js

@@ -1,9 +1,7 @@
-import { S as SvelteComponentDev, i as init, s as safe_not_equal, d as dispatch_dev, v as validate_store, y as currentURL, c as component_subscribe, a as validate_slots, l as link, g as globals, b as space, e as element, t as text, h as attr_dev, f as add_location, j as insert_dev, k as append_dev, p as action_destroyer, m as set_data_dev, n as noop, o as detach_dev, z as run_all } from './main2.js';
+import { S as SvelteComponentDev, i as init, s as safe_not_equal, d as dispatch_dev, v as validate_store, y as currentURL, c as component_subscribe, a as validate_slots, l as link, b as space, e as element, t as text, h as attr_dev, f as add_location, j as insert_dev, k as append_dev, p as action_destroyer, m as set_data_dev, n as noop, o as detach_dev, z as run_all } from './main2.js';
 
-/* Query.svelte generated by Svelte v4.2.8 */
-
-const { console: console_1 } = globals;
-const file = "Query.svelte";
+/* src/Query.svelte generated by Svelte v4.2.17 */
+const file = "src/Query.svelte";
 
 function create_fragment(ctx) {
 	let t0;
@@ -35,14 +33,14 @@ function create_fragment(ctx) {
 			a1.textContent = "bar";
 			document.title = "query";
 			attr_dev(span, "id", "name");
-			add_location(span, file, 14, 11, 311);
-			add_location(p, file, 14, 2, 302);
+			add_location(span, file, 9, 11, 230);
+			add_location(p, file, 9, 2, 221);
 			attr_dev(a0, "href", "/query?name=foo");
-			add_location(a0, file, 15, 2, 349);
+			add_location(a0, file, 10, 2, 268);
 			attr_dev(a1, "href", "/query?name=bar");
-			add_location(a1, file, 16, 2, 394);
+			add_location(a1, file, 11, 2, 313);
 			attr_dev(div, "class", "query");
-			add_location(div, file, 13, 0, 280);
+			add_location(div, file, 8, 0, 199);
 		},
 		l: function claim(nodes) {
 			throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
@@ -99,31 +97,18 @@ function instance($$self, $$props, $$invalidate) {
 	let name;
 	let $currentURL;
 	validate_store(currentURL, 'currentURL');
-	component_subscribe($$self, currentURL, $$value => $$invalidate(2, $currentURL = $$value));
+	component_subscribe($$self, currentURL, $$value => $$invalidate(1, $currentURL = $$value));
 	let { $$slots: slots = {}, $$scope } = $$props;
 	validate_slots('Query', slots, []);
-	let { article = null } = $$props;
-	console.log(article);
-	const writable_props = ['article'];
+	const writable_props = [];
 
 	Object.keys($$props).forEach(key => {
-		if (!~writable_props.indexOf(key) && key.slice(0, 2) !== '$$' && key !== 'slot') console_1.warn(`<Query> was created with unknown prop '${key}'`);
+		if (!~writable_props.indexOf(key) && key.slice(0, 2) !== '$$' && key !== 'slot') console.warn(`<Query> was created with unknown prop '${key}'`);
 	});
 
-	$$self.$$set = $$props => {
-		if ('article' in $$props) $$invalidate(1, article = $$props.article);
-	};
-
-	$$self.$capture_state = () => ({
-		link,
-		currentURL,
-		article,
-		name,
-		$currentURL
-	});
+	$$self.$capture_state = () => ({ link, currentURL, name, $currentURL });
 
 	$$self.$inject_state = $$props => {
-		if ('article' in $$props) $$invalidate(1, article = $$props.article);
 		if ('name' in $$props) $$invalidate(0, name = $$props.name);
 	};
 
@@ -132,18 +117,18 @@ function instance($$self, $$props, $$invalidate) {
 	}
 
 	$$self.$$.update = () => {
-		if ($$self.$$.dirty & /*$currentURL*/ 4) {
-			$$invalidate(0, name = $currentURL.searchParams.get("name") || 'unknown');
+		if ($$self.$$.dirty & /*$currentURL*/ 2) {
+			$$invalidate(0, name = $currentURL.searchParams.get("name") ?? 'unknown');
 		}
 	};
 
-	return [name, article, $currentURL];
+	return [name, $currentURL];
 }
 
 class Query extends SvelteComponentDev {
 	constructor(options) {
 		super(options);
-		init(this, options, instance, create_fragment, safe_not_equal, { article: 1 });
+		init(this, options, instance, create_fragment, safe_not_equal, {});
 
 		dispatch_dev("SvelteRegisterComponent", {
 			component: this,
@@ -152,14 +137,6 @@ class Query extends SvelteComponentDev {
 			id: create_fragment.name
 		});
 	}
-
-	get article() {
-		throw new Error("<Query>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
-	}
-
-	set article(value) {
-		throw new Error("<Query>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
-	}
 }
 
 export { Query as default };

package/examples/app-svelte4/dist/Query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Query.js","sources":["../src/Query.svelte"],"sourcesContent":["<script>\n  import { link, currentURL } from \"svelte-spa-history-router\";\n\n  $: name = $currentURL.searchParams.get(\"name\") ?? 'unknown';\n</script>\n<svelte:head>\n  <title>query</title>\n</svelte:head>\n<div class=\"query\">\n  <p>name: <span id=\"name\">{ name }</span></p>\n  <a use:link href=\"/query?name=foo\">foo</a>\n  <a use:link href=\"/query?name=bar\">bar</a>\n</div>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;aASK,QAAM,CAAA,CAAA;;sBAAkB,GAAI,CAAA,CAAA,CAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;GADjC,UAIM,CAAA,MAAA,EAAA,GAAA,EAAA,MAAA,CAAA,CAAA;GAHJ,UAA4C,CAAA,GAAA,EAAA,CAAA,CAAA,CAAA;;GAAnC,UAA+B,CAAA,CAAA,EAAA,IAAA,CAAA,CAAA;;;GACxC,UAA0C,CAAA,GAAA,EAAA,EAAA,CAAA,CAAA;;GAC1C,UAA0C,CAAA,GAAA,EAAA,EAAA,CAAA,CAAA;;;;;;;;;;;;qDAFf,GAAI,CAAA,CAAA,CAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAN9B,YAAA,CAAA,CAAA,EAAE,IAAI,GAAG,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAA,IAAK,SAAS,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;"}