@rohal12/spindle 0.51.4 → 0.52.1

package/src/saves/storage.ts

@@ -4,7 +4,13 @@ import type { SaveRecord, PlaythroughRecord, StorageBackend } from './types';
 // Memory backend
 // ---------------------------------------------------------------------------
 
+/**
+ * In-memory storage. Like the other backends it stores copies: records and
+ * values go in and come out cloned, so changing a record after storing it,
+ * or one that was read, changes nothing stored.
+ */
 export function createMemoryBackend(): StorageBackend {
+  const copy = <T>(value: T): T => structuredClone(value);
   const saves = new Map<string, SaveRecord>();
   const playthroughs = new Map<string, PlaythroughRecord>();
   const meta = new Map<string, unknown>();
@@ -13,11 +19,12 @@ export function createMemoryBackend(): StorageBackend {
     type: 'memory',
 
     async putSave(record: SaveRecord): Promise<void> {
-      saves.set(record.meta.id, record);
+      saves.set(record.meta.id, copy(record));
     },
 
     async getSave(id: string): Promise<SaveRecord | undefined> {
-      return saves.get(id);
+      const record = saves.get(id);
+      return record && copy(record);
     },
 
     async deleteSave(id: string): Promise<void> {
@@ -25,7 +32,7 @@ export function createMemoryBackend(): StorageBackend {
     },
 
     async getSavesByIfid(ifid: string): Promise<SaveRecord[]> {
-      return [...saves.values()].filter((s) => s.meta.ifid === ifid);
+      return [...saves.values()].filter((s) => s.meta.ifid === ifid).map(copy);
     },
 
     async deleteSavesByIfid(ifid: string): Promise<void> {
@@ -48,11 +55,13 @@ export function createMemoryBackend(): StorageBackend {
     },
 
     async putPlaythrough(record: PlaythroughRecord): Promise<void> {
-      playthroughs.set(record.id, record);
+      playthroughs.set(record.id, copy(record));
     },
 
     async getPlaythroughsByIfid(ifid: string): Promise<PlaythroughRecord[]> {
-      return [...playthroughs.values()].filter((p) => p.ifid === ifid);
+      return [...playthroughs.values()]
+        .filter((p) => p.ifid === ifid)
+        .map(copy);
     },
 
     async deletePlaythroughsByIfid(ifid: string): Promise<void> {
@@ -67,11 +76,11 @@ export function createMemoryBackend(): StorageBackend {
     },
 
     async getMeta<T = unknown>(key: string): Promise<T | undefined> {
-      return meta.get(key) as T | undefined;
+      return copy(meta.get(key)) as T | undefined;
     },
 
     async setMeta(key: string, value: unknown): Promise<void> {
-      meta.set(key, value);
+      meta.set(key, copy(value));
     },
 
     async deleteMeta(key: string): Promise<void> {

package/src/saves/types.ts

@@ -133,7 +133,8 @@ function isImportablePayload(value: unknown): value is SavePayload {
 
   const { history, historyIndex } = value;
   if (!Array.isArray(history) || history.length === 0) return false;
-  if (!history.every(isSaveHistoryMoment)) return false;
+  // Array.from: every() skips the holes of a sparse array
+  if (!Array.from(history).every(isSaveHistoryMoment)) return false;
   if (
     typeof historyIndex !== 'number' ||
     !Number.isInteger(historyIndex) ||

package/src/settings.ts

@@ -1,4 +1,5 @@
 import { useStoryStore } from './store';
+import { createNamespace, ownValue } from './utils/namespace';
 
 export interface ToggleConfig {
   label: string;
@@ -25,7 +26,9 @@ export type SettingDef =
   | { type: 'range'; config: RangeConfig };
 
 const definitions = new Map<string, SettingDef>();
-let values: Record<string, unknown> = {};
+// No prototype, so a setting may be named `constructor` or `__proto__`:
+// every name is plain storage (see utils/namespace.ts)
+let values: Record<string, unknown> = createNamespace();
 let storageLoaded = false;
 let unsubscribeStoryData: (() => void) | null = null;
 
@@ -65,7 +68,7 @@ function loadFromStorage(): void {
         parsed !== null &&
         !Array.isArray(parsed)
       ) {
-        values = { ...values, ...parsed };
+        values = createNamespace(values, parsed);
       }
     }
   } catch {
@@ -76,7 +79,7 @@ function loadFromStorage(): void {
 export const settings = {
   addToggle(name: string, config: ToggleConfig): void {
     definitions.set(name, { type: 'toggle', config });
-    if (!(name in values)) {
+    if (!Object.prototype.hasOwnProperty.call(values, name)) {
       values[name] = config.default;
     }
     loadFromStorage();
@@ -84,7 +87,7 @@ export const settings = {
 
   addList(name: string, config: ListConfig): void {
     definitions.set(name, { type: 'list', config });
-    if (!(name in values)) {
+    if (!Object.prototype.hasOwnProperty.call(values, name)) {
       values[name] = config.default;
     }
     loadFromStorage();
@@ -92,28 +95,28 @@ export const settings = {
 
   addRange(name: string, config: RangeConfig): void {
     definitions.set(name, { type: 'range', config });
-    if (!(name in values)) {
+    if (!Object.prototype.hasOwnProperty.call(values, name)) {
       values[name] = config.default;
     }
     loadFromStorage();
   },
 
   get(name: string): unknown {
-    return values[name];
+    return ownValue(values, name);
   },
 
   getToggle(name: string): boolean {
-    const v = values[name];
+    const v = ownValue(values, name);
     return typeof v === 'boolean' ? v : false;
   },
 
   getList(name: string): string {
-    const v = values[name];
+    const v = ownValue(values, name);
     return typeof v === 'string' ? v : '';
   },
 
   getRange(name: string): number {
-    const v = values[name];
+    const v = ownValue(values, name);
     return typeof v === 'number' ? v : 0;
   },