refactor: rename PrefixedStorage to Storage

.changeset/real-moons-invent.md

@@ -0,0 +1,5 @@
+---
+"@reactive-dot/core": patch
+---
+
+Renamed `PrefixedStorage` to `Storage`.

packages/core/src/index.ts

@@ -12,5 +12,5 @@ export { defineConfig, type ChainConfig, type Config } from "./config.js";
 export { MutationError, QueryError, ReactiveDotError } from "./errors.js";
 export { Query } from "./query-builder.js";
 export type { Register } from "./register.js";
-export { PrefixedStorage } from "./storage.js";
+export { Storage } from "./storage.js";
 export { idle, pending } from "./symbols.js";

packages/core/src/simple-storage.ts

@@ -0,0 +1 @@
+export type SimpleStorage = Pick<Storage, "getItem" | "removeItem" | "setItem">;

packages/core/src/storage.ts

@@ -1,20 +1,21 @@
-export type SimpleStorage = Pick<Storage, "getItem" | "removeItem" | "setItem">;
+import type { SimpleStorage } from "./simple-storage.js";
 
-export type PrefixedStorageOptions = {
+export type StorageOptions = {
   prefix: string;
-  storage: SimpleStorage;
+  storage: SimpleStorage | (() => SimpleStorage);
 };
 
-export class PrefixedStorage<TKey extends string = string>
-  implements SimpleStorage
-{
+export class Storage<TKey extends string = string> implements SimpleStorage {
   readonly prefix: string;
 
   #storage: SimpleStorage;
 
-  constructor(options: PrefixedStorageOptions) {
+  constructor(options: StorageOptions) {
     this.prefix = options.prefix;
-    this.#storage = options.storage;
+    this.#storage =
+      typeof options.storage === "function"
+        ? options.storage()
+        : options.storage;
   }
 
   getItem(key: TKey) {
@@ -30,20 +31,18 @@ export class PrefixedStorage<TKey extends string = string>
   }
 
   join<TKeyOverride extends string | void = void>(path: string) {
-    return new PrefixedStorage<TKeyOverride extends void ? TKey : TKeyOverride>(
-      {
-        prefix: `${this.prefix}/${path}`,
-        storage: this.#storage,
-      },
-    );
+    return new Storage<TKeyOverride extends void ? TKey : TKeyOverride>({
+      prefix: `${this.prefix}/${path}`,
+      storage: this.#storage,
+    });
   }
 
   #prefixKey(key: string) {
     return `${this.prefix}/${key}`;
   }
 }
 
-export const defaultStorage = new PrefixedStorage({
+export const defaultStorage = new Storage({
   prefix: "@reactive-dot",
   storage: globalThis.localStorage,
 });

packages/core/src/wallets/wallet.ts

@@ -1,9 +1,9 @@
-import { type PrefixedStorage, defaultStorage } from "../storage.js";
+import { type Storage, defaultStorage } from "../storage.js";
 import type { PolkadotSignerAccount } from "./account.js";
 import { firstValueFrom, type Observable } from "rxjs";
 
 export type WalletOptions = {
-  storage?: PrefixedStorage | undefined;
+  storage?: Storage | undefined;
 };
 
 export abstract class Wallet<
@@ -14,7 +14,7 @@ export abstract class Wallet<
 
   abstract readonly name: string;
 
-  readonly #storage: PrefixedStorage;
+  readonly #storage: Storage;
 
   protected get storage() {
     return this.#storage.join<TStorageKey>(this.id);