Skip to content

Commit 6e950b7

Browse files
authored
inmemory -> volatile storage provider (#582)
rename to simplify 'common memory/remote' vs 'in-memory/memory'
1 parent a59e891 commit 6e950b7

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

runner/src/storage.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { isStatic, markAsStatic } from "@commontools/builder";
1111
import { StorageProvider, StorageValue } from "./storage/base.ts";
1212
import { RemoteStorageProvider } from "./storage/remote.ts";
1313
import { debug } from "@commontools/html"; // FIXME(ja): can we move debug to somewhere else?
14-
import { InMemoryStorageProvider } from "./storage/memory.ts";
14+
import { VolatileStorageProvider } from "./storage/volatile.ts";
1515
import { Signer } from "@commontools/identity";
1616
import { isBrowser } from "@commontools/utils/env";
1717

@@ -248,8 +248,8 @@ class StorageImpl implements Storage {
248248
if (!provider) {
249249
// Default to "remote", but let either custom URL (used in tests) or
250250
// environment variable override this.
251-
const type = this.remoteStorageUrl?.protocol === "memory:"
252-
? "memory"
251+
const type = this.remoteStorageUrl?.protocol === "volatile:"
252+
? "volatile"
253253
: ((import.meta as any).env?.VITE_STORAGE_TYPE ?? "remote");
254254

255255
if (type === "remote") {
@@ -262,8 +262,8 @@ class StorageImpl implements Storage {
262262
space: space as `did:${string}:${string}`,
263263
as: this.signer,
264264
});
265-
} else if (type === "memory") {
266-
provider = new InMemoryStorageProvider(space);
265+
} else if (type === "volatile") {
266+
provider = new VolatileStorageProvider(space);
267267
} else {
268268
throw new Error(`Unknown storage type: ${type}`);
269269
}

runner/src/storage/memory.ts renamed to runner/src/storage/volatile.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { log } from "../storage.ts";
33
import { BaseStorageProvider, type StorageValue } from "./base.ts";
44

55
/**
6-
* In-memory storage provider. Just for testing.
6+
* Volatile (in-memory) storage provider. Just for testing.
77
*
8-
* It doesn't make much sense, since it's just a copy of the in memory docs.
8+
* It doesn't make much sense, since it's just a copy of the volatile docs.
99
* But for testing we can create multiple instances that share the memory.
1010
*/
1111
const spaceStorageMap = new Map<string, Map<string, StorageValue>>();
@@ -32,7 +32,7 @@ function getOrCreateSpaceSubscribers(
3232
return spaceSubscribersMap.get(spaceName)!;
3333
}
3434

35-
export class InMemoryStorageProvider extends BaseStorageProvider {
35+
export class VolatileStorageProvider extends BaseStorageProvider {
3636
private handleStorageUpdateFn: (key: string, value: any) => void;
3737
private lastValues = new Map<string, string | undefined>();
3838
private spaceName: string;
@@ -62,7 +62,7 @@ export class InMemoryStorageProvider extends BaseStorageProvider {
6262
const key = JSON.stringify(entityId);
6363
const valueString = JSON.stringify(value);
6464
if (this.lastValues.get(key) !== valueString) {
65-
log(() => ["send in memory", this.spaceName, key, valueString]);
65+
log(() => ["send volatile", this.spaceName, key, valueString]);
6666
this.lastValues.set(key, valueString);
6767
spaceStorage.set(key, value);
6868
spaceSubscribers.forEach((listener) => listener(key, value));
@@ -79,7 +79,7 @@ export class InMemoryStorageProvider extends BaseStorageProvider {
7979
const spaceStorage = getOrCreateSpaceStorage(this.spaceName);
8080
const key = JSON.stringify(entityId);
8181
log(
82-
() => ["sync in memory", this.spaceName, key, this.lastValues.get(key)],
82+
() => ["sync volatile", this.spaceName, key, this.lastValues.get(key)],
8383
);
8484
if (spaceStorage.has(key)) {
8585
this.lastValues.set(key, JSON.stringify(spaceStorage.get(key)!));
@@ -91,7 +91,7 @@ export class InMemoryStorageProvider extends BaseStorageProvider {
9191

9292
get<T>(entityId: EntityId): StorageValue<T> | undefined {
9393
const key = JSON.stringify(entityId);
94-
log(() => ["get in memory", this.spaceName, key, this.lastValues.get(key)]);
94+
log(() => ["get volatile", this.spaceName, key, this.lastValues.get(key)]);
9595
return this.lastValues.has(key)
9696
? (JSON.parse(this.lastValues.get(key)!) as StorageValue)
9797
: undefined;

runner/test/storage.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { afterEach, beforeEach, describe, it } from "@std/testing/bdd";
22
import { expect } from "@std/expect";
33
import { storage } from "../src/storage.ts";
44
import { StorageProvider } from "../src/storage/base.ts";
5-
import { InMemoryStorageProvider } from "../src/storage/memory.ts";
65
import { CellLink, createRef, DocImpl, getDoc } from "@commontools/runner";
6+
import { VolatileStorageProvider } from "../src/storage/volatile.ts";
77
import { Identity } from "@commontools/identity";
88

9-
storage.setRemoteStorage(new URL("memory://"));
9+
storage.setRemoteStorage(new URL("volatile://"));
1010
storage.setSigner(await Identity.fromPassphrase("test operator"));
1111

1212
describe("Storage", () => {
@@ -15,7 +15,7 @@ describe("Storage", () => {
1515
let n = 0;
1616

1717
beforeEach(() => {
18-
storage2 = new InMemoryStorageProvider("test");
18+
storage2 = new VolatileStorageProvider("test");
1919
testDoc = getDoc<string>(
2020
undefined as unknown as string,
2121
`storage test cell ${n++}`,

0 commit comments

Comments
 (0)