@ctx-core/window 15.1.20 → 15.1.21

package/hostname/index.js

@@ -1,15 +1,16 @@
 import { nullish__none_ } from '@ctx-core/function'
 import { be_computed_pair_ } from '@ctx-core/nanostores'
-import { window_location_ } from '../window_location/index.js'
+import { window_location$_ } from '../window_location/index.js'
 /** @typedef {import('@ctx-core/object').Ctx} */
 /** @type {typeof import('./index.d.ts').hostname$_} */
 export const [
 	hostname$_,
 	hostname_,
-] = be_computed_pair_(ctx=>
-	nullish__none_([window_location_(ctx)], window_location=>
-		window_location.hostname))
-	.config({ id: 'hostname' })
+] = be_computed_pair_(
+	ctx=>window_location$_(ctx),
+	window_location=>nullish__none_([window_location], ()=>
+		window_location.hostname),
+	{ id: 'hostname' })
 export {
 	hostname$_ as hostname__,
 	hostname$_ as window_location_hostname__,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctx-core/window",
-  "version": "15.1.20",
+  "version": "15.1.21",
   "description": "ctx-core window",
   "keywords": [
     "ctx-core",
@@ -31,10 +31,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@ctx-core/dom": "^15.1.18",
-    "@ctx-core/function": "^21.22.13",
-    "@ctx-core/nanostores": "^9.0.2",
-    "@ctx-core/object": "^31.0.1"
+    "@ctx-core/dom": "^15.1.19",
+    "@ctx-core/function": "^21.22.14",
+    "@ctx-core/nanostores": "^9.0.3",
+    "@ctx-core/object": "^31.1.0"
   },
   "devDependencies": {
     "c8": "^8.0.1",

package/pathname/index.js

@@ -1,15 +1,16 @@
 import { nullish__none_ } from '@ctx-core/function'
 import { be_computed_pair_ } from '@ctx-core/nanostores'
-import { window_location_ } from '../window_location/index.js'
+import { window_location$_ } from '../window_location/index.js'
 /** @typedef {import('@ctx-core/object').Ctx} */
 /** @type {typeof import('./index.d.ts').pathname$_} */
 export const [
 	pathname$_,
 	pathname_,
-] = be_computed_pair_(ctx=>
-	nullish__none_([window_location_(ctx)], window_location=>
-		window_location.pathname))
-	.config({ id: 'pathname' })
+] = be_computed_pair_(
+	ctx=>window_location$_(ctx),
+	window_location=>nullish__none_([window_location], ()=>
+		window_location.pathname),
+	{ id: 'pathname' })
 export {
 	pathname$_ as pathname__,
 	pathname$_ as b__pathname,

package/window_location/index.js

@@ -1,5 +1,5 @@
 import { has_dom, no_dom } from '@ctx-core/dom'
-import { atom_, be_computed_pair_, onMount } from '@ctx-core/nanostores'
+import { atom_, be_computed_pair_, computed_, onMount } from '@ctx-core/nanostores'
 import { be_ } from '@ctx-core/object'
 const window_location__atom$_ = be_(()=>
 	atom_())
@@ -11,18 +11,18 @@ const window_location__atom$_ = be_(()=>
 export const [
 	window_location$_,
 	window_location_,
-] = /** @type {be_computed_pair_T<Location>} */ be_computed_pair_(ctx=>
-	window_location__atom$_(ctx))
-	.config({ id: 'window_location' })
-	.oninit((ctx, window_location$)=>{
-		if (has_dom) {
-			let onpopstate = ()=>window_location__reset(ctx)
-			onMount(window_location$, ()=>{
-				window.addEventListener('popstate', onpopstate)
-				return ()=>window.removeEventListener('popstate', onpopstate)
-			})
-		}
-	})
+] = /** @type {be_computed_pair_T<Location>} */ be_computed_pair_(be_(ctx=>{
+	const window_location$ = computed_(window_location__atom$_(ctx),
+		window_location__atom=>window_location__atom)
+	if (has_dom) {
+		let onpopstate = ()=>window_location__reset(ctx)
+		onMount(window_location$, ()=>{
+			window.addEventListener('popstate', onpopstate)
+			return ()=>window.removeEventListener('popstate', onpopstate)
+		})
+	}
+	return window_location$
+}, { id: 'window_location' }))
 export { window_location$_ as window_location__ }
 /**
  * @param {Ctx}ctx