Rename NewStorage to Storage

...and `storage2` to `storage`

Author: mrbbot

packages/tre/src/index.ts

@@ -69,7 +69,7 @@ import {
   defaultTimers,
   formatResponse,
 } from "./shared";
-import { NewStorage } from "./storage2";
+import { Storage } from "./storage";
 import { CoreHeaders } from "./workers";
 
 // ===== `Miniflare` User Options =====
@@ -884,7 +884,7 @@ export class Miniflare {
     plugin: keyof Plugins,
     namespace: string,
     persist?: Persistence
-  ): NewStorage {
+  ): Storage {
     const factory = this.#gatewayFactories[plugin];
     assert(factory !== undefined);
     return factory.getStorage(namespace, persist);
@@ -912,5 +912,5 @@ export * from "./http";
 export * from "./plugins";
 export * from "./runtime";
 export * from "./shared";
-export * from "./storage2";
+export * from "./storage";
 export * from "./workers";

packages/tre/src/plugins/cache/gateway.ts

@@ -9,8 +9,8 @@ import {
   InclusiveRange,
   KeyValueStorage,
   MultipartReadableStream,
-  NewStorage,
-} from "../../storage2";
+  Storage,
+} from "../../storage";
 import { isSitesRequest } from "../kv";
 import { _parseRanges } from "../shared";
 import {
@@ -232,7 +232,7 @@ export class CacheGateway {
 
   constructor(
     private readonly log: Log,
-    storage: NewStorage,
+    storage: Storage,
     private readonly timers: Timers
   ) {
     this.storage = new KeyValueStorage(storage, timers);

packages/tre/src/plugins/d1/gateway.ts

@@ -7,7 +7,7 @@ import type { Database as DatabaseType } from "better-sqlite3";
 import { z } from "zod";
 import { Response } from "../../http";
 import { HttpError, Log } from "../../shared";
-import { NewStorage } from "../../storage2";
+import { Storage } from "../../storage";
 import splitSqlQuery from "./splitter";
 
 export const D1ValueSchema = z.union([
@@ -153,7 +153,7 @@ interface ChangesLastRowResult {
 export class D1Gateway {
   private readonly db: DatabaseType;
 
-  constructor(private readonly log: Log, storage: NewStorage) {
+  constructor(private readonly log: Log, storage: Storage) {
     this.db = storage.db;
   }
 

packages/tre/src/plugins/kv/gateway.ts

@@ -7,7 +7,7 @@ import {
   millisToSeconds,
   secondsToMillis,
 } from "../../shared";
-import { KeyValueStorage, NewStorage } from "../../storage2";
+import { KeyValueStorage, Storage } from "../../storage";
 import {
   MAX_KEY_SIZE,
   MAX_LIST_KEYS,
@@ -157,7 +157,7 @@ export class KVGateway {
 
   constructor(
     private readonly log: Log,
-    storage: NewStorage,
+    storage: Storage,
     private readonly timers: Timers
   ) {
     this.storage = new KeyValueStorage(storage, timers);

packages/tre/src/plugins/kv/sites.ts

@@ -13,7 +13,7 @@ import {
   serialiseRegExps,
   testRegExps,
 } from "../../shared";
-import { createFileReadableStream } from "../../storage2";
+import { createFileReadableStream } from "../../storage";
 import { CoreBindings } from "../../workers";
 import {
   BINDING_TEXT_PERSIST,

packages/tre/src/plugins/queues/gateway.ts

@@ -7,7 +7,7 @@ import { stringify } from "devalue";
 import { Colorize, bold, green, grey, red, reset, yellow } from "kleur/colors";
 import { z } from "zod";
 import { Log, Timers } from "../../shared";
-import { NewStorage } from "../../storage2";
+import { Storage } from "../../storage";
 import { CoreHeaders, structuredSerializableReducers } from "../../workers";
 import { DispatchFetch, QueueConsumer } from "../shared";
 
@@ -99,7 +99,7 @@ export class QueuesGateway {
 
   constructor(
     private readonly log: Log,
-    _storage: NewStorage,
+    _storage: Storage,
     private readonly timers: Timers,
     private readonly queueName: string,
     private readonly dispatchFetch: DispatchFetch

packages/tre/src/plugins/r2/gateway.ts

@@ -14,10 +14,10 @@ import {
 import {
   BlobId,
   InclusiveRange,
-  NewStorage,
+  Storage,
   TypedDatabase,
   escapeLike,
-} from "../../storage2";
+} from "../../storage";
 import {
   BadUpload,
   EntityTooSmall,
@@ -443,6 +443,7 @@ function sqlStmts(db: TypedDatabase) {
         parts.sort((a, b) => a.part_number - b.part_number);
         let partSize: number | undefined;
         for (const part of parts.slice(0, -1)) {
+          // noinspection JSUnusedAssignment
           partSize ??= part.size;
           if (
             part.size < R2Gateway._MIN_MULTIPART_PART_SIZE ||
@@ -541,7 +542,7 @@ export class R2Gateway {
   /** @internal */
   static _MIN_MULTIPART_PART_SIZE = 5 * 1024 * 1024;
 
-  readonly #storage: NewStorage;
+  readonly #storage: Storage;
   readonly #stmts: ReturnType<typeof sqlStmts>;
 
   // Multipart uploads are stored as multiple blobs. Therefore, when reading a
@@ -568,7 +569,7 @@ export class R2Gateway {
 
   constructor(
     private readonly log: Log,
-    storage: NewStorage,
+    storage: Storage,
     private readonly timers: Timers
   ) {
     this.#storage = storage;
@@ -605,7 +606,7 @@ export class R2Gateway {
   }
 
   #assembleMultipartValue(
-    storage: NewStorage,
+    storage: Storage,
     parts: Pick<MultipartPartRow, "blob_id" | "size">[],
     queryRange: InclusiveRange
   ): ReadableStream<Uint8Array> {

packages/tre/src/plugins/r2/validator.ts

@@ -1,6 +1,6 @@
 import assert from "assert";
 import type { R2StringChecksums } from "@cloudflare/workers-types/experimental";
-import { InclusiveRange } from "../../storage2";
+import { InclusiveRange } from "../../storage";
 import { _parseRanges } from "../shared";
 import {
   BadDigest,

packages/tre/src/plugins/shared/gateway.ts

@@ -10,11 +10,7 @@ import {
   Timers,
   sanitisePath,
 } from "../../shared";
-import {
-  NewStorage,
-  createFileStorage,
-  createMemoryStorage,
-} from "../../storage2";
+import { Storage, createFileStorage, createMemoryStorage } from "../../storage";
 
 // TODO: explain why persist passed as header, want options set to be atomic,
 //  if set gateway before script update, may be using new persist before new script
@@ -40,7 +36,7 @@ export type CloudflareFetch = z.infer<typeof CloudflareFetchSchema>;
 export interface GatewayConstructor<Gateway> {
   new (
     log: Log,
-    storage: NewStorage,
+    storage: Storage,
     timers: Timers,
     namespace: string,
     dispatchFetch: DispatchFetch
@@ -59,7 +55,7 @@ export function maybeParseURL(url: Persistence): URL | undefined {
 }
 
 export class GatewayFactory<Gateway> {
-  readonly #memoryStorages = new Map<string, NewStorage>();
+  readonly #memoryStorages = new Map<string, Storage>();
   readonly #gateways = new Map<string, [Persistence, Gateway]>();
 
   constructor(
@@ -77,7 +73,7 @@ export class GatewayFactory<Gateway> {
     return storage;
   }
 
-  getStorage(namespace: string, persist: Persistence): NewStorage {
+  getStorage(namespace: string, persist: Persistence): Storage {
     // If persistence is disabled, use memory storage
     if (persist === undefined || persist === false) {
       return this.#getMemoryStorage(namespace);

packages/tre/src/plugins/shared/range.ts

@@ -1,4 +1,4 @@
-import { InclusiveRange } from "../../storage2";
+import { InclusiveRange } from "../../storage";
 
 // Matches case-insensitive string "bytes", ignoring surrounding whitespace,
 // followed by "=" (example matches: "bytes=...", "ByTeS=...", "   bytes  =...")

packages/tre/src/storage2/blob/index.ts packages/tre/src/storage/blob/index.ts

@@ -13,7 +13,7 @@ import {
   MultipartReadableStream,
 } from "./blob";
 import { TypedDatabase } from "./sql";
-import { NewStorage } from "./storage";
+import { Storage } from "./storage";
 
 export interface KeyEntry<Metadata = unknown> {
   key: string;
@@ -121,7 +121,7 @@ export class KeyValueStorage<Metadata = unknown> {
   readonly #stmts: ReturnType<typeof sqlStmts>;
 
   constructor(
-    private readonly storage: NewStorage,
+    private readonly storage: Storage,
     private readonly timers: Timers = defaultTimers
   ) {
     storage.db.pragma("case_sensitive_like = TRUE");

packages/tre/src/storage2/blob/store.ts packages/tre/src/storage/blob/store.ts

@@ -4,19 +4,18 @@ import Database from "better-sqlite3";
 import { BlobStore, FileBlobStore, MemoryBlobStore } from "./blob";
 import { TypedDatabase } from "./sql";
 
-// TODO: rename to `Storage` and move to `src/storage` once all gateways migrated
-export interface NewStorage {
+export interface Storage {
   db: TypedDatabase;
   blob: BlobStore;
 }
 
-export function createMemoryStorage(): NewStorage {
+export function createMemoryStorage(): Storage {
   const db = new Database(":memory:") as TypedDatabase;
   const blob = new MemoryBlobStore();
   return { db, blob };
 }
 
-export function createFileStorage(root: string): NewStorage {
+export function createFileStorage(root: string): Storage {
   root = path.resolve(root);
   fs.mkdirSync(root, { recursive: true });
   const db = new Database(path.join(root, "db.sqlite")) as TypedDatabase;

packages/tre/src/storage2/blob/streams.ts packages/tre/src/storage/blob/streams.ts

@@ -33,10 +33,10 @@ import {
   Miniflare,
   MiniflareOptions,
   MultipartPartRow,
-  NewStorage,
   ObjectRow,
   R2Gateway,
   Response,
+  Storage,
   TypedDatabase,
   createFileStorage,
   viewToArray,
@@ -387,7 +387,7 @@ class TestR2MultipartUpload implements R2MultipartUpload {
 interface Context extends MiniflareTestContext {
   ns: string;
   r2: TestR2Bucket;
-  storage: NewStorage;
+  storage: Storage;
 }
 
 const opts: Partial<MiniflareOptions> = {