@vskstudio/takt-astro 0.2.0 → 0.2.1

package/README.md

@@ -53,7 +53,7 @@ Both the integration and the component accept the same options:
 
 ## View Transitions
 
-Astro's client router navigates via `history.pushState`. Core's SPA tracking patches `pushState`, so a single pageview fires per client navigation — including View Transitions DOM swaps — while `init()` fires the one initial pageview. That single source means navigations are never double-counted. The runtime is SSR/prerender safe — it only runs in the browser.
+Astro's client router runs several history operations per navigation (scroll-restoration `replaceState` plus `pushState`), so Takt does **not** rely on core's history patch here — it would over-count. Instead the runtime fires one explicit initial pageview and then one per Astro `astro:after-swap` event (including View Transitions DOM swaps and back/forward), so each navigation is counted exactly once. On a plain MPA (no client router) the script re-runs per page load, which fires the initial pageview each time. The runtime is SSR/prerender safe — it only runs in the browser.
 
 ## Custom events
 

package/Takt.astro

@@ -1,10 +1,33 @@
 ---
-import { resolveOptions, type TaktOptions } from './src/options'
-import { buildRuntime } from './src/runtime'
+// Import from the built output: the published package ships dist/ + this file,
+// not src/, so a src import would break on install.
+import { resolveOptions, type TaktOptions } from './dist/index.js'
 
 type Props = TaktOptions
 
-const runtime = buildRuntime(resolveOptions(Astro.props))
+// Options travel as a JSON data island, NOT interpolated into JS, so a domain or
+// endpoint containing `</script>`/quotes can't break out. `<` is escaped so the
+// value can't terminate the island's <script> tag either.
+const config = JSON.stringify(resolveOptions(Astro.props))
+  .replace(/</g, '\\u003c')
+  .replace(/>/g, '\\u003e')
+  .replace(/&/g, '\\u0026')
 ---
 <!-- Pick ONE install path — this component OR the integration — not both. -->
-<script is:inline type="module" set:html={runtime}></script>
+<script type="application/json" data-takt-config set:html={config}></script>
+<!-- A bundled (non-inline) module so Astro resolves the bare core import; an
+     is:inline module would leave it unresolved in the browser. -->
+<script>
+  import { init, pageview } from '@vskstudio/takt-core'
+  const el = document.querySelector('script[data-takt-config]')
+  const w = window as unknown as { __takt?: boolean }
+  if (el && !w.__takt) {
+    const o = JSON.parse(el.textContent || '{}')
+    w.__takt = true
+    // auto forced off: Astro's ClientRouter runs several history ops per nav, so
+    // core's history patch would over-count. Drive pageviews from after-swap.
+    init({ ...o, auto: false })
+    pageview()
+    if (o.auto !== false) document.addEventListener('astro:after-swap', () => pageview())
+  }
+</script>

package/dist/index.js

@@ -13,23 +13,24 @@ function resolveOptions(options = {}) {
 
 // src/runtime.ts
 function buildRuntime(options) {
-  const json = JSON.stringify(options).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026");
+  const spa = options.auto !== false;
+  const json = JSON.stringify({ ...options, auto: false }).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026");
   return [
-    `import { init } from '@vskstudio/takt-core';`,
+    `import { init, pageview } from '@vskstudio/takt-core';`,
     // SSR/prerender guard: this module is evaluated under Node when Astro
     // prerenders, where window/init's browser APIs are absent.
     `if (typeof window !== 'undefined' && !window.__takt) {`,
     `  const o = ${json};`,
     // Idempotent across both entry paths (integration + <Takt/>): the flag stops
-    // a second boot from disposing the first instance's listeners.
+    // a second boot from re-registering listeners or re-firing the initial view.
     `  window.__takt = true;`,
-    // Single source of pageviews. init() enables core's SPA tracking, which
-    // patches history.pushState/replaceState. Astro's ClientRouter navigates via
-    // pushState and does NOT replace the history object on DOM swap, so the patch
-    // persists and fires one pageview per View Transitions navigation. init()
-    // also fires the initial pageview. We therefore do NOT listen to
-    // astro:page-load — doing so would double-count every in-app navigation.
     `  init(o);`,
+    // One initial pageview (also covers full-page MPA loads, where the script
+    // re-runs per navigation and astro:after-swap never fires).
+    `  pageview();`,
+    // astro:after-swap fires exactly once per ClientRouter navigation (incl.
+    // back/forward), giving one pageview per nav with no double-count.
+    ...spa ? [`  document.addEventListener('astro:after-swap', () => pageview());`] : [],
     `}`
   ].join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vskstudio/takt-astro",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Astro integration for Takt privacy-friendly analytics",
   "license": "MIT",
   "author": "VSK Studio",
@@ -47,6 +47,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.31.0",
+    "@playwright/test": "^1.50.0",
     "@size-limit/preset-small-lib": "^11.1.6",
     "@vskstudio/takt-core": "^0.2.0",
     "astro": "^5.0.0",
@@ -62,6 +63,7 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint .",
     "test": "vitest run",
+    "e2e": "playwright test",
     "size": "size-limit",
     "release": "pnpm build && changeset publish"
   }