Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gameblocks/modules/user-interface/StorageSettingsStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ export class JsonSettingsStore {

load() {
const saved = readJsonStorageItem(this.storage, this.storageKey, null);
this.settings = { ...this.defaults };
if (saved && typeof saved === 'object') {
this.settings = {
...this.settings,
...this.defaults,
...saved,
};
}
Expand Down
34 changes: 34 additions & 0 deletions gameblocks/modules/user-interface/StorageSettingsStore.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { JsonSettingsStore } from './StorageSettingsStore.js';

function memoryStorage(initial = {}) {
const data = { ...initial };
return {
getItem(key) {
return Object.prototype.hasOwnProperty.call(data, key) ? data[key] : null;
},
setItem(key, value) {
data[key] = String(value);
},
};
}

test('load merges saved keys onto defaults, not dirty in-memory settings', () => {
const storage = memoryStorage({
demo: JSON.stringify({ volume: 0.2 }),
});
const store = new JsonSettingsStore(storage, 'demo', { volume: 1, muted: false });
store.update({ volume: 0.9, extra: 'stale' });
const loaded = store.load();
assert.equal(loaded.volume, 0.2);
assert.equal(loaded.muted, false);
assert.equal(loaded.extra, undefined);
});

test('load with empty storage restores defaults', () => {
const store = new JsonSettingsStore(memoryStorage(), 'demo', { volume: 1 });
store.update({ volume: 0 });
const loaded = store.load();
assert.equal(loaded.volume, 1);
});