@poveste/app 0.12.3 → 0.13.1

package/src/app/util/events.ts

@@ -1,4 +1,5 @@
 import { EVENT_SEND } from './const'
+import { occupant } from './occupant'
 
 export async function logEvent(name: string, argument) {
   const event = {
@@ -9,6 +10,8 @@ export async function logEvent(name: string, argument) {
     window.parent?.postMessage({
       type: EVENT_SEND,
       event,
+      storyId: occupant.storyId,
+      variantId: occupant.variantId,
     })
   }
   else {

package/src/app/util/highlighter.ts

@@ -1,5 +1,6 @@
-import type { Highlighter } from 'shiki'
-import { createHighlighter } from 'shiki'
+import type { HighlighterCore } from 'shiki/core'
+import { createHighlighterCore } from 'shiki/core'
+import { createOnigurumaEngine } from 'shiki/engine/oniguruma'
 
 /**
  * Shiki is meant to be used as a singleton: each instance carries its own WASM
@@ -9,18 +10,32 @@ import { createHighlighter } from 'shiki'
  *
  * The langs and themes are fixed, so one shared instance is always correct.
  */
-let highlighterPromise: Promise<Highlighter> | undefined
+let highlighterPromise: Promise<HighlighterCore> | undefined
 
-export function getHighlighter(): Promise<Highlighter> {
-  highlighterPromise ??= createHighlighter({
+/**
+ * `shiki/core`, not `shiki`: the latter is the full-bundle entry and ships every
+ * grammar and theme whatever the options ask for — 10 MB a book (#304). The
+ * dynamic imports are the interface, not a lazy-loading choice.
+ */
+export function getHighlighter(): Promise<HighlighterCore> {
+  highlighterPromise ??= createHighlighterCore({
     langs: [
-      'html',
-      'jsx',
+      import('shiki/langs/html.mjs'),
+      import('shiki/langs/jsx.mjs'),
     ],
+    /*
+     * `github-light-high-contrast`, not `github-light`. The plain one paints
+     * keywords at 4.38:1 on the pane background, variables at 3.34 and tag
+     * names at 4.43 — three of its twelve token colours miss AA (#533). This is
+     * GitHub's own accessible build of the same theme, so code keeps reading the
+     * way it did, and the colours are maintained upstream rather than darkened
+     * by hand here.
+     */
     themes: [
-      'github-light',
-      'github-dark',
+      import('shiki/themes/github-light-high-contrast.mjs'),
+      import('shiki/themes/github-dark.mjs'),
     ],
+    engine: createOnigurumaEngine(import('shiki/wasm')),
   }).catch((e) => {
     // Don't let a cached rejection disable highlighting for the rest of the
     // session — drop it so the next mount can try again.

package/src/app/util/mapping.ts

@@ -71,7 +71,11 @@ export function mapVariant(variant: Variant, existingVariant?: Variant): Variant
         _hPropDefs: {},
       }),
       setupApp: null,
-      slots: () => ({}),
+      // The three keys `Variant` declares, absent rather than missing: a
+      // variant created here defines no slots, and consumers read them
+      // with `||`. `Story.slots` is `() => any`, which is why the same
+      // literal above needs nothing.
+      slots: () => ({ default: undefined, controls: undefined, source: undefined }),
       previewReady: false,
     }
   }

package/src/app/util/occupant.ts

@@ -0,0 +1,13 @@
+/**
+ * What the sandbox realm is currently showing.
+ *
+ * The realm is reused: a `SANDBOX_RETARGET` hands it another story rather than
+ * booting a new document, so a message can outlive the occupant that queued it.
+ * Every message `sandbox.ts` posts already carries these ids for that reason;
+ * this module exists so `logEvent` — which posts from wherever a story calls it,
+ * not from `sandbox.ts` — can carry them too (#328).
+ */
+export const occupant: { storyId: string | null, variantId: string | null } = {
+  storyId: null,
+  variantId: null,
+}

package/src/app/util/variant.ts

@@ -1,8 +1,20 @@
 import type { Ref } from 'vue'
-import type { Variant } from '../types'
+import type { Story, Variant } from '../types'
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
+/**
+ * Whether opening this story will put a variant in the route by itself.
+ *
+ * `StoryView` resolves the variant one tick after the story, so anything that
+ * has to tell "a variant is on its way" from "this story is waiting for the
+ * reader to pick one" needs the same answer it will give — hence one predicate
+ * rather than two copies of the condition (#328).
+ */
+export function autoSelectsVariant(story: Story | null | undefined): boolean {
+  return !!story && (!!story.lastSelectedVariant || story.variants.length === 1)
+}
+
 export function useCurrentVariantRoute(variant: Ref<Variant>) {
   const route = useRoute()
   const isActive = computed(() => route.query.variantId === variant.value.id)

package/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Guillaume Chau (original "histoire" project)
-Copyright (c) 2026 Sorin Gitlan (poveste fork)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.