@rohal12/spindle 0.59.6 → 0.59.8

package/src/store.ts

@@ -259,7 +259,7 @@ let sessionMoments: SaveHistoryMoment[] = [];
  * Write the game to the session: the whole payload, encoded in one piece
  * on every navigation.
  */
-function persistSession(get: () => StoryState): void {
+function persistSession(get: () => StoryState): { error: unknown } | undefined {
   const {
     storyData,
     currentPassage,
@@ -269,7 +269,7 @@ function persistSession(get: () => StoryState): void {
     visitCounts,
     renderCounts,
   } = get();
-  if (!storyData) return;
+  if (!storyData) return undefined;
 
   // Trim cache when history shrank (navigate() drops discarded forward
   // moments itself, since a replacement branch may keep the same length)
@@ -294,7 +294,7 @@ function persistSession(get: () => StoryState): void {
     }
   }
 
-  saveSession(storyData.ifid, {
+  return saveSession(storyData.ifid, {
     passage: currentPassage,
     variables,
     history: sessionMoments,
@@ -324,7 +324,11 @@ const NAVIGATION_ERROR_CONTEXT = 'The story could not go to another passage:';
 function persistSessionThen(get: () => StoryState, after?: () => void): void {
   let failure: { error: unknown } | undefined;
   try {
-    persistSession(get);
+    const storageFailure = persistSession(get);
+    // The story goes on, but a reload would go back to the last copy
+    if (storageFailure) {
+      showRuntimeError(SESSION_ERROR_CONTEXT, storageFailure.error);
+    }
   } catch (error) {
     failure = { error };
     // The player sees it too: a reload would go back to the last moment

package/src/structural.ts

@@ -674,17 +674,20 @@ export function underChange(
 
 /**
  * The segment standing for the entry `index` of a Map or Set in a path, or
- * for the `cause` or `errors` of an Error ('c', 'e').
+ * for the `cause` or `errors` of an Error ('c', 'e'), or for the buffer a
+ * typed array or DataView views ('b').
  */
-const entryKey = (kind: 'k' | 'v' | 's' | 'c' | 'e', index: number): string =>
-  `\0${kind}${index}`;
+const entryKey = (
+  kind: 'k' | 'v' | 's' | 'c' | 'e' | 'b',
+  index: number,
+): string => `\0${kind}${index}`;
 
 export const isEntryKey = (segment: string): boolean =>
   segment.startsWith('\0');
 
 /**
- * What a Map, Set or Error holds in place of properties (keys and values,
- * members, `cause` and `errors`), each with the segment standing for it in
+ * What a Map, Set, Error or view holds in place of properties (keys and
+ * values, members, `cause` and `errors`, the buffer), each with the segment standing for it in
  * a path (see entryKey); undefined for any other value.
  */
 function entryChildren(value: object): [string, unknown][] | undefined {
@@ -707,6 +710,9 @@ function entryChildren(value: object): [string, unknown][] | undefined {
         ]);
       }
     }
+  } else if (ArrayBuffer.isView(value)) {
+    // Views of one buffer share it, which an alias of the buffer changes
+    children.push([entryKey('b', 0), value.buffer]);
   } else {
     return undefined;
   }

package/src/styles.css

@@ -261,6 +261,11 @@ tw-storydata {
   max-width: 400px;
 }
 
+/* Keep the first control clear of the close button above it */
+.dialog-settings .dialog-body {
+  padding-top: 2.25em;
+}
+
 .dialog-close {
   position: absolute;
   top: 0.75em;

package/src/widgets/widget-def.ts

@@ -36,7 +36,14 @@ export function parseWidgetDef(rawArgs: string): WidgetDef {
   return widgetDef(parseMacroArgs(rawArgs, WIDGET_PARAMETERS));
 }
 
-const BLOCK_WIDGET = /\{widget\s+["']?(\w+)["']?[^}]*\}([\s\S]*?)\{\/widget\}/g;
+/**
+ * A definition: its arguments (read like a {widget} macro's, see
+ * parseWidgetDef) and its body. Macro names are not case-sensitive.
+ */
+const WIDGET_DEFINITION = /\{widget\s+([^}]*)\}([\s\S]*?)\{\/widget\}/gi;
+
+/** `{@children}`, also with selectors such as `{.highlight @children}`. */
+const CHILDREN_PLACEHOLDER = /\{[^{}]*@children\s*\}/;
 
 /**
  * The names of the block widgets (those whose body renders `{@children}`)
@@ -52,8 +59,13 @@ export function blockWidgetNames(
     if (passage.name !== 'StoryInit' && !passage.tags?.includes('widget')) {
       continue;
     }
-    for (const match of passage.content.matchAll(BLOCK_WIDGET)) {
-      if (/\{@children\}/.test(match[2]!)) names.push(match[1]!);
+    for (const match of passage.content.matchAll(WIDGET_DEFINITION)) {
+      if (!CHILDREN_PLACEHOLDER.test(match[2]!)) continue;
+      try {
+        names.push(parseWidgetDef(match[1]!).name);
+      } catch {
+        // The {widget} macro reports a definition it cannot read
+      }
     }
   }
   return names;