refactor: move to `utils/cloudflare.ts'

src/drivers/cloudflare-kv-binding.ts

@@ -1,5 +1,7 @@
 /// <reference types="@cloudflare/workers-types" />
-import { createError, defineDriver, joinKeys, getBinding } from "./utils";
+import { getBinding } from "./utils/cloudflare";
+import { defineDriver, joinKeys } from "./utils";
+
 export interface KVOptions {
   binding?: string | KVNamespace;
 

src/drivers/cloudflare-r2-binding.ts

@@ -1,8 +1,9 @@
 /// <reference types="@cloudflare/workers-types" />
-import { createError, defineDriver, joinKeys, getBinding } from "./utils";
+import { getBinding } from "./utils/cloudflare";
+import { defineDriver, joinKeys } from "./utils";
 
 export interface CloudflareR2Options {
-  binding: string | R2Bucket;
+  binding?: string | R2Bucket;
   base?: string;
 }
 

src/drivers/utils/cloudflare.ts

@@ -0,0 +1,30 @@
+/// <reference types="@cloudflare/workers-types" />
+import { createError } from '.'
+
+export function getBinding(binding: KVNamespace | R2Bucket | string) {
+  let bindingName = "[binding]";
+
+  if (typeof binding === "string") {
+    bindingName = binding;
+    binding = ((globalThis as any)[bindingName] ||
+      (globalThis as any).__env__?.[bindingName]) as KVNamespace | R2Bucket;
+  }
+
+  if (!binding) {
+    throw createError(
+      'Cloudflare',
+      `Invalid binding \`${bindingName}\`: \`${binding}\``
+    );
+  }
+
+  for (const key of ["get", "put", "delete"]) {
+    if (!(key in binding)) {
+      throw createError(
+        'Cloudflare',
+        `Invalid binding \`${bindingName}\`: \`${key}\` key is missing`
+      );
+    }
+  }
+
+  return binding;
+}

src/drivers/utils/index.ts

@@ -1,4 +1,3 @@
-/// <reference types="@cloudflare/workers-types" />
 import type { Driver } from "../../types";
 
 type DriverFactory<T> = (opts: T) => Driver;
@@ -39,32 +38,4 @@ export function createRequiredError(driver: string, name: string | string[]) {
     );
   }
   return createError(driver, `Missing required option \`${name}\`.`);
-}
-
-export function getBinding(binding: KVNamespace | R2Bucket | string) {
-  let bindingName = "[binding]";
-
-  if (typeof binding === "string") {
-    bindingName = binding;
-    binding = ((globalThis as any)[bindingName] ||
-      (globalThis as any).__env__?.[bindingName]) as KVNamespace | R2Bucket;
-  }
-
-  if (!binding) {
-    throw createError(
-      'Cloudflare',
-      `Invalid binding \`${bindingName}\`: \`${binding}\``
-    );
-  }
-
-  for (const key of ["get", "put", "delete"]) {
-    if (!(key in binding)) {
-      throw createError(
-        'Cloudflare',
-        `Invalid binding \`${bindingName}\`: \`${key}\` key is missing`
-      );
-    }
-  }
-
-  return binding;
 }