add mixedModeConnectionString to the various binding configs (#9168)

Author: dario-piotrowicz

.changeset/chatty-years-speak.md

@@ -0,0 +1,8 @@
+---
+"wrangler": patch
+---
+
+remove experimental `MixedModeConnectionString` type
+
+remove the experimental `MixedModeConnectionString` type which
+is now exposed by Miniflare instead

.changeset/thin-years-jump.md

@@ -0,0 +1,5 @@
+---
+"miniflare": patch
+---
+
+add `mixedModeConnectionString` to the various binding configs

packages/miniflare/src/plugins/core/services.ts

@@ -1,6 +1,10 @@
 import { z } from "zod";
 import { Request, Response } from "../../http";
-import { HOST_CAPNP_CONNECT, Miniflare } from "../../index";
+import {
+	HOST_CAPNP_CONNECT,
+	Miniflare,
+	MixedModeConnectionString,
+} from "../../index";
 import {
 	ExternalServer,
 	HttpOptions_Style,
@@ -91,6 +95,7 @@ export const ServiceDesignatorSchema = z.union([
 		name: z.union([z.string(), z.literal(kCurrentWorker)]),
 		entrypoint: z.ostring(),
 		props: z.record(z.unknown()).optional(),
+		mixedModeConnectionString: z.custom<MixedModeConnectionString>().optional(),
 	}),
 	z.object({ network: NetworkSchema }),
 	z.object({ external: ExternalServerSchema }),

packages/miniflare/src/plugins/d1/index.ts

@@ -11,6 +11,7 @@ import {
 	getMiniflareObjectBindings,
 	getPersistPath,
 	migrateDatabase,
+	MixedModeConnectionString,
 	namespaceEntries,
 	namespaceKeys,
 	objectEntryWorker,
@@ -21,7 +22,20 @@ import {
 } from "../shared";
 
 export const D1OptionsSchema = z.object({
-	d1Databases: z.union([z.record(z.string()), z.string().array()]).optional(),
+	d1Databases: z
+		.union([
+			z.record(z.string()),
+			z.record(
+				z.object({
+					id: z.string(),
+					mixedModeConnectionString: z
+						.custom<MixedModeConnectionString>()
+						.optional(),
+				})
+			),
+			z.string().array(),
+		])
+		.optional(),
 });
 export const D1SharedOptionsSchema = z.object({
 	d1Persist: PersistenceSchema,

packages/miniflare/src/plugins/do/index.ts

@@ -5,6 +5,7 @@ import { getUserServiceName } from "../core";
 import {
 	getPersistPath,
 	kUnsafeEphemeralUniqueKey,
+	MixedModeConnectionString,
 	PersistenceSchema,
 	Plugin,
 	ProxyNodeBinding,
@@ -29,6 +30,9 @@ export const DurableObjectsOptionsSchema = z.object({
 						.optional(),
 					// Prevents the Durable Object being evicted.
 					unsafePreventEviction: z.boolean().optional(),
+					mixedModeConnectionString: z
+						.custom<MixedModeConnectionString>()
+						.optional(),
 				}),
 			])
 		)

packages/miniflare/src/plugins/kv/index.ts

@@ -12,6 +12,7 @@ import {
 	getMiniflareObjectBindings,
 	getPersistPath,
 	migrateDatabase,
+	MixedModeConnectionString,
 	namespaceEntries,
 	namespaceKeys,
 	objectEntryWorker,
@@ -29,7 +30,20 @@ import {
 } from "./sites";
 
 export const KVOptionsSchema = z.object({
-	kvNamespaces: z.union([z.record(z.string()), z.string().array()]).optional(),
+	kvNamespaces: z
+		.union([
+			z.record(z.string()),
+			z.record(
+				z.object({
+					id: z.string(),
+					mixedModeConnectionString: z
+						.custom<MixedModeConnectionString>()
+						.optional(),
+				})
+			),
+			z.string().array(),
+		])
+		.optional(),
 
 	// Workers Sites
 	sitePath: PathSchema.optional(),

packages/miniflare/src/plugins/queues/index.ts

@@ -15,6 +15,7 @@ import {
 import { getUserServiceName } from "../core";
 import {
 	getMiniflareObjectBindings,
+	MixedModeConnectionString,
 	objectEntryWorker,
 	Plugin,
 	ProxyNodeBinding,
@@ -24,7 +25,15 @@ import {
 export const QueuesOptionsSchema = z.object({
 	queueProducers: z
 		.union([
-			z.record(QueueProducerOptionsSchema),
+			z.record(
+				QueueProducerOptionsSchema.merge(
+					z.object({
+						mixedModeConnectionString: z
+							.custom<MixedModeConnectionString>()
+							.optional(),
+					})
+				)
+			),
 			z.string().array(),
 			z.record(z.string()),
 		])

packages/miniflare/src/plugins/r2/index.ts

@@ -11,6 +11,7 @@ import {
 	getMiniflareObjectBindings,
 	getPersistPath,
 	migrateDatabase,
+	MixedModeConnectionString,
 	namespaceEntries,
 	namespaceKeys,
 	objectEntryWorker,
@@ -21,7 +22,20 @@ import {
 } from "../shared";
 
 export const R2OptionsSchema = z.object({
-	r2Buckets: z.union([z.record(z.string()), z.string().array()]).optional(),
+	r2Buckets: z
+		.union([
+			z.record(z.string()),
+			z.record(
+				z.object({
+					id: z.string(),
+					mixedModeConnectionString: z
+						.custom<MixedModeConnectionString>()
+						.optional(),
+				})
+			),
+			z.string().array(),
+		])
+		.optional(),
 });
 export const R2SharedOptionsSchema = z.object({
 	r2Persist: PersistenceSchema,

packages/miniflare/src/plugins/shared/index.ts

@@ -125,7 +125,7 @@ export class ProxyNodeBinding {
 }
 
 export function namespaceKeys(
-	namespaces?: Record<string, string> | string[]
+	namespaces?: Record<string, string | { id: string }> | string[]
 ): string[] {
 	if (Array.isArray(namespaces)) {
 		return namespaces;
@@ -136,13 +136,28 @@ export function namespaceKeys(
 	}
 }
 
+export type MixedModeConnectionString = URL & {
+	__brand: "MixedModeConnectionString";
+};
+
 export function namespaceEntries(
-	namespaces?: Record<string, string> | string[]
+	namespaces?:
+		| Record<
+				string,
+				| string
+				| { id: string; mixedModeConnectionString?: MixedModeConnectionString }
+		  >
+		| string[]
 ): [bindingName: string, id: string][] {
 	if (Array.isArray(namespaces)) {
 		return namespaces.map((bindingName) => [bindingName, bindingName]);
 	} else if (namespaces !== undefined) {
-		return Object.entries(namespaces);
+		return Object.entries(namespaces).map(([key, value]) => {
+			if (typeof value === "string") {
+				return [key, value];
+			}
+			return [key, value.id];
+		});
 	} else {
 		return [];
 	}

packages/miniflare/src/plugins/workflows/index.ts

@@ -5,6 +5,7 @@ import { Service } from "../../runtime";
 import { getUserServiceName } from "../core";
 import {
 	getPersistPath,
+	MixedModeConnectionString,
 	PersistenceSchema,
 	Plugin,
 	ProxyNodeBinding,
@@ -17,6 +18,9 @@ export const WorkflowsOptionsSchema = z.object({
 				name: z.string(),
 				className: z.string(),
 				scriptName: z.string().optional(),
+				mixedModeConnectionString: z
+					.custom<MixedModeConnectionString>()
+					.optional(),
 			})
 		)
 		.optional(),