Merge pull request #533 from microbit-foundation/523-fix-competing-pe…

…rsistantwritables 523 fix competing persistantwritables
microbit-foundation · Oct 9, 2024 · b8b121c · b8b121c
2 parents 800a07e + 57aeb4b
commit b8b121c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 166 deletions.
diff --git a/src/i18n.ts b/src/i18n.ts
@@ -7,8 +7,8 @@
 import { init, locale, register } from 'svelte-i18n';
 export { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import { persistantWritable } from './script/stores/storeUtil';
 import browserLang from 'browser-lang';
+import PersistantWritable from './script/repository/PersistantWritable';
 
 register('en', () => import('./messages/ui.en.json'));
 register('da', () => import('./messages/ui.da.json'));
@@ -18,7 +18,7 @@ const initialLocale = browserLang({
   fallback: 'en',
 });
 
-const persistantLocale = persistantWritable('lang', initialLocale);
+const persistantLocale = new PersistantWritable(initialLocale, 'lang');
 
 locale.subscribe(newLocal => {
   if (newLocal) {

diff --git a/src/script/stores/connectionStore.ts b/src/script/stores/connectionStore.ts
@@ -5,19 +5,19 @@
  */
 
 import { get, type Writable } from 'svelte/store';
-import { persistantWritable } from './storeUtil';
 import { MBSpecs } from 'microbyte';
+import PersistantWritable from '../repository/PersistantWritable';
 // Todo: Rename file to a more appropriate name
 // Pattern for connecting to input microbit
-export const btPatternInput: Writable<boolean[]> = persistantWritable<boolean[]>(
-  'btPatternInput',
+export const btPatternInput: Writable<boolean[]> = new PersistantWritable<boolean[]>(
   Array<boolean>(25).fill(false),
+  'btPatternInput',
 );
 
 // Pattern for connecting to output microbit
-export const btPatternOutput: Writable<boolean[]> = persistantWritable<boolean[]>(
-  'btPatternOutput',
+export const btPatternOutput: Writable<boolean[]> = new PersistantWritable<boolean[]>(
   Array<boolean>(25).fill(false),
+  'btPatternOutput',
 );
 
 export const isInputPatternValid = () => {

diff --git a/src/script/stores/knnConfig.ts b/src/script/stores/knnConfig.ts
@@ -3,13 +3,16 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import { persistantWritable } from './storeUtil';
 import StaticConfiguration from '../../StaticConfiguration';
+import PersistantWritable from '../repository/PersistantWritable';
 
 export type KNNSettings = {
   k: number;
 };
 
-export const knnConfig = persistantWritable<KNNSettings>('knnConfig', {
-  k: StaticConfiguration.defaultKnnNeighbourCount,
-});
+export const knnConfig = new PersistantWritable(
+  {
+    k: StaticConfiguration.defaultKnnNeighbourCount,
+  },
+  'knnConfig',
+);
diff --git a/src/script/stores/storeUtil.ts b/src/script/stores/storeUtil.ts