@cloudflare/config 0.7.0 → 0.9.0

package/dist/index.mjs

@@ -14,6 +14,7 @@ var __commonJS = (cb, mod) => function() {
 
 //#endregion
 //#region src/schema.ts
+const RemoteBindingDevSchema = z.strictObject({ remote: z.boolean().optional() });
 const AssetsSchema = z.strictObject({
 	htmlHandling: z.enum([
 		"auto-trailing-slash",
@@ -30,38 +31,37 @@ const AssetsSchema = z.strictObject({
 });
 const BrowserBindingSchema = z.strictObject({
 	type: z.literal("browser"),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const WorkerBindingSchema = z.strictObject({
 	type: z.literal("worker"),
-	workerName: z.string(),
+	worker: z.string(),
 	exportName: z.string().optional(),
 	props: z.record(z.string(), z.unknown()).optional(),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const D1BindingSchema = z.strictObject({
 	type: z.literal("d1"),
 	name: z.string().optional(),
 	id: z.string().optional(),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const KVBindingSchema = z.strictObject({
 	type: z.literal("kv"),
 	id: z.string().optional(),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const QueueBindingSchema = z.strictObject({
 	type: z.literal("queue"),
 	name: z.string().optional(),
 	deliveryDelay: z.number().optional(),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const R2BindingSchema = z.strictObject({
 	type: z.literal("r2"),
 	name: z.string().optional(),
 	jurisdiction: z.string().optional(),
-	remote: z.boolean().optional(),
-	localDev: z.strictObject({ experimentalS3Credentials: z.object({
+	dev: RemoteBindingDevSchema.extend({ experimentalS3Credentials: z.object({
 		accessKeyId: z.string(),
 		secretAccessKey: z.string()
 	}).optional() }).optional()
@@ -73,38 +73,38 @@ const AnalyticsEngineDatasetBindingSchema = z.strictObject({
 const FlagshipBindingSchema = z.strictObject({
 	type: z.literal("flagship"),
 	id: z.string().optional(),
-	remote: z.boolean().optional()
+	dev: RemoteBindingDevSchema.optional()
 });
 const HyperdriveBindingSchema = z.strictObject({
 	type: z.literal("hyperdrive"),
 	id: z.string(),
-	localConnectionString: z.string().optional()
+	dev: z.strictObject({ connectionString: z.string().optional() }).optional()
 });
 const KnownBindingSchema = z.discriminatedUnion("type", [
 	z.strictObject({
 		type: z.literal("agent-memory"),
 		namespace: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("ai"),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("ai-search"),
 		name: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("ai-search-namespace"),
 		namespace: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	AnalyticsEngineDatasetBindingSchema,
 	z.strictObject({
 		type: z.literal("artifacts"),
 		namespace: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({ type: z.literal("assets") }),
 	BrowserBindingSchema,
@@ -113,21 +113,21 @@ const KnownBindingSchema = z.discriminatedUnion("type", [
 		type: z.literal("dispatch-namespace"),
 		namespace: z.string().optional(),
 		outbound: z.strictObject({
-			workerName: z.string(),
+			worker: z.string(),
 			parameters: z.array(z.string()).optional()
 		}).optional(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("durable-object"),
-		workerName: z.string(),
+		worker: z.string(),
 		exportName: z.string()
 	}),
 	FlagshipBindingSchema,
 	HyperdriveBindingSchema,
 	z.strictObject({
 		type: z.literal("images"),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("json"),
@@ -140,17 +140,17 @@ const KnownBindingSchema = z.discriminatedUnion("type", [
 	}),
 	z.strictObject({
 		type: z.literal("media"),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("mtls-certificate"),
 		id: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("pipeline"),
 		name: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	QueueBindingSchema,
 	z.strictObject({
@@ -173,11 +173,11 @@ const KnownBindingSchema = z.discriminatedUnion("type", [
 		destinationAddress: z.string().optional(),
 		allowedDestinationAddresses: z.array(z.string()).optional(),
 		allowedSenderAddresses: z.array(z.string()).optional(),
-		remote: z.boolean().optional()
-	}),
+		dev: RemoteBindingDevSchema.optional()
+	}).refine((value) => value.destinationAddress === void 0 || value.allowedDestinationAddresses === void 0, { message: "\"send-email\" bindings cannot specify both \"destinationAddress\" and \"allowedDestinationAddresses\"" }),
 	z.strictObject({
 		type: z.literal("stream"),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("text"),
@@ -186,29 +186,26 @@ const KnownBindingSchema = z.discriminatedUnion("type", [
 	z.strictObject({
 		type: z.literal("vectorize"),
 		name: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({ type: z.literal("version-metadata") }),
 	z.strictObject({
 		type: z.literal("vpc-service"),
 		id: z.string(),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	z.strictObject({
 		type: z.literal("vpc-network"),
 		tunnelId: z.string().optional(),
 		networkId: z.string().optional(),
-		remote: z.boolean().optional()
-	}).superRefine((value, ctx) => {
-		const hasTunnel = value.tunnelId !== void 0;
-		if (hasTunnel === (value.networkId !== void 0)) ctx.addIssue({
-			code: "custom",
-			message: hasTunnel ? `"vpc-network" bindings must specify exactly one of "tunnelId" or "networkId", not both` : `"vpc-network" bindings must specify either "tunnelId" or "networkId"`
-		});
-	}),
+		dev: RemoteBindingDevSchema.optional()
+	}).refine((value) => value.tunnelId !== void 0 !== (value.networkId !== void 0), { error: ({ input }) => {
+		const value = input;
+		return value.tunnelId !== void 0 && value.networkId !== void 0 ? `"vpc-network" bindings must specify exactly one of "tunnelId" or "networkId", not both` : `"vpc-network" bindings must specify either "tunnelId" or "networkId"`;
+	} }),
 	z.strictObject({
 		type: z.literal("web-search"),
-		remote: z.boolean().optional()
+		dev: RemoteBindingDevSchema.optional()
 	}),
 	WorkerBindingSchema,
 	z.strictObject({ type: z.literal("worker-loader") })
@@ -353,7 +350,7 @@ const PlacementSchema = z.union([
 	})
 ]);
 const TailConsumerSchema = z.strictObject({
-	workerName: z.string(),
+	worker: z.string(),
 	streaming: z.boolean().optional()
 });
 const TriggerSchema = z.discriminatedUnion("type", [
@@ -432,30 +429,39 @@ const BaseWorkerSchema = z.strictObject({
 */
 const InputWorkerSchema = BaseWorkerSchema.extend({ entrypoint: z.union([z.string(), z.strictObject({ default: z.string() })]).transform((value) => typeof value === "string" ? value : value.default).optional() });
 /**
-* Settings schema — validates the named `settings` export of a
+* Input settings schema — validates the named `settings` export of a
 * `cloudflare.config.ts`. Holds account/deployment settings shared by the other exports.
 */
-const SettingsSchema = z.strictObject({
+const InputSettingsSchema = z.strictObject({
 	type: z.literal("settings"),
 	accountId: z.string().optional(),
 	complianceRegion: z.enum(["public", "fedramp-high"]).optional()
 });
 /**
-* Discriminated union of the config kinds a single export may resolve to.
+* Output settings schema — the shape of the top-level `config.json` in the
+* Build Output Specification. Adds the `mode` the build was produced in.
 */
-const ConfigExportSchema = z.discriminatedUnion("type", [InputWorkerSchema, SettingsSchema]);
+const OutputSettingsSchema = InputSettingsSchema.extend({ mode: z.string().optional() });
 const SETTINGS_EXPORT_NAME = "settings";
-/**
-* Schema for the resolved config exports, keyed by export
-* name. Each value is discriminated on its `type` field. Reserves the
-* `settings` export name exclusively for settings configs: a `settings`
-* config must live on the `settings` export, and the `settings` export
-* may only hold a `settings` config.
-*/
-const ConfigExportsSchema = z.record(z.string(), ConfigExportSchema).check((ctx) => {
+const SUPPORTED_EXPORT_TYPES = new Set(["worker", "settings"]);
+function invalidConfigExportMessage(exportName) {
+	return `The \`${exportName}\` export is not a supported export type. Move constants, helper functions, and other unsupported exports to a separate module.`;
+}
+const ConfigExportsTypeSchema = z.record(z.string(), z.unknown()).check((ctx) => {
 	for (const [key, value] of Object.entries(ctx.value)) {
+		const isObject = typeof value === "object" && value !== null;
+		const type = isObject && "type" in value ? value.type : void 0;
+		if (typeof type !== "string" || !SUPPORTED_EXPORT_TYPES.has(type)) {
+			ctx.issues.push({
+				code: "custom",
+				input: value,
+				path: isObject ? [key, "type"] : [key],
+				message: invalidConfigExportMessage(key)
+			});
+			continue;
+		}
 		const isSettingsName = key === SETTINGS_EXPORT_NAME;
-		const isSettingsType = value.type === "settings";
+		const isSettingsType = type === "settings";
 		if (isSettingsType && !isSettingsName) ctx.issues.push({
 			code: "custom",
 			input: value,
@@ -466,10 +472,19 @@ const ConfigExportsSchema = z.record(z.string(), ConfigExportSchema).check((ctx)
 			code: "custom",
 			input: value,
 			path: [key],
-			message: `The \`${SETTINGS_EXPORT_NAME}\` export is reserved for a \`settings\` config; found a \`${value.type}\` config.`
+			message: `The \`${SETTINGS_EXPORT_NAME}\` export is reserved for a \`settings\` config; found a \`${type}\` config.`
 		});
 	}
 });
+const ConfigExportsObjectSchema = z.object({ settings: InputSettingsSchema.optional() }).catchall(InputWorkerSchema);
+/**
+* Schema for the resolved config exports, keyed by export
+* name. Each value is discriminated on its `type` field. Reserves the
+* `settings` export name exclusively for settings configs: a `settings`
+* config must live on the `settings` export, and the `settings` export
+* may only hold a `settings` config.
+*/
+const ConfigExportsSchema = ConfigExportsTypeSchema.pipe(ConfigExportsObjectSchema);
 const ModuleTypeSchema = z.enum([
 	"esm",
 	"cjs",
@@ -3215,27 +3230,27 @@ function convertBindingsAndAssets(config, result) {
 				agentMemory.push(omitUndefined({
 					binding: name,
 					namespace: binding.namespace,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "ai":
 				result.ai = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "ai-search":
 				aiSearch.push(omitUndefined({
 					binding: name,
 					instance_name: binding.name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "ai-search-namespace":
 				aiSearchNamespaces.push(omitUndefined({
 					binding: name,
 					namespace: binding.namespace,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "analytics-engine-dataset":
@@ -3248,7 +3263,7 @@ function convertBindingsAndAssets(config, result) {
 				artifacts.push(omitUndefined({
 					binding: name,
 					namespace: binding.namespace,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "assets":
@@ -3257,7 +3272,7 @@ function convertBindingsAndAssets(config, result) {
 			case "browser":
 				result.browser = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "d1":
@@ -3265,7 +3280,7 @@ function convertBindingsAndAssets(config, result) {
 					binding: name,
 					database_id: binding.id,
 					database_name: binding.name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "dispatch-namespace": {
@@ -3274,10 +3289,10 @@ function convertBindingsAndAssets(config, result) {
 					namespace: binding.namespace
 				};
 				if (binding.outbound) entry.outbound = omitUndefined({
-					service: binding.outbound.workerName,
+					service: binding.outbound.worker,
 					parameters: binding.outbound.parameters
 				});
-				if (binding.remote !== void 0) entry.remote = binding.remote;
+				if (binding.dev?.remote !== void 0) entry.remote = binding.dev.remote;
 				dispatchNamespaces.push(entry);
 				break;
 			}
@@ -3285,27 +3300,27 @@ function convertBindingsAndAssets(config, result) {
 				durableObjectBindings.push({
 					name,
 					class_name: binding.exportName,
-					script_name: binding.workerName
+					script_name: binding.worker
 				});
 				break;
 			case "flagship":
 				flagship.push(omitUndefined({
 					binding: name,
 					app_id: binding.id,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "hyperdrive":
 				hyperdrive.push(omitUndefined({
 					binding: name,
 					id: binding.id,
-					localConnectionString: binding.localConnectionString
+					localConnectionString: binding.dev?.connectionString
 				}));
 				break;
 			case "images":
 				result.images = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "json":
@@ -3315,7 +3330,7 @@ function convertBindingsAndAssets(config, result) {
 				kvNamespaces.push(omitUndefined({
 					binding: name,
 					id: binding.id,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "logfwdr":
@@ -3327,21 +3342,21 @@ function convertBindingsAndAssets(config, result) {
 			case "media":
 				result.media = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "mtls-certificate":
 				mtlsCertificates.push(omitUndefined({
 					binding: name,
 					certificate_id: binding.id,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "pipeline":
 				pipelines.push(omitUndefined({
 					binding: name,
 					stream: binding.name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "queue":
@@ -3349,7 +3364,7 @@ function convertBindingsAndAssets(config, result) {
 					binding: name,
 					queue: binding.name,
 					delivery_delay: binding.deliveryDelay,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "rate-limit":
@@ -3360,12 +3375,12 @@ function convertBindingsAndAssets(config, result) {
 				});
 				break;
 			case "r2": {
-				const experimentalS3Credentials = binding.localDev?.experimentalS3Credentials;
+				const experimentalS3Credentials = binding.dev?.experimentalS3Credentials;
 				r2Buckets.push(omitUndefined({
 					binding: name,
 					bucket_name: binding.name,
 					jurisdiction: binding.jurisdiction,
-					remote: binding.remote,
+					remote: binding.dev?.remote,
 					local_dev: experimentalS3Credentials === void 0 ? void 0 : { experimental_s3_credentials: experimentalS3Credentials }
 				}));
 				break;
@@ -3386,13 +3401,13 @@ function convertBindingsAndAssets(config, result) {
 					destination_address: binding.destinationAddress,
 					allowed_destination_addresses: binding.allowedDestinationAddresses,
 					allowed_sender_addresses: binding.allowedSenderAddresses,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "stream":
 				result.stream = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "text":
@@ -3402,7 +3417,7 @@ function convertBindingsAndAssets(config, result) {
 				vectorize.push(omitUndefined({
 					binding: name,
 					index_name: binding.name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "version-metadata":
@@ -3412,34 +3427,34 @@ function convertBindingsAndAssets(config, result) {
 				vpcServices.push(omitUndefined({
 					binding: name,
 					service_id: binding.id,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "vpc-network":
 				if (binding.tunnelId !== void 0) vpcNetworks.push(omitUndefined({
 					binding: name,
 					tunnel_id: binding.tunnelId,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				else if (binding.networkId !== void 0) vpcNetworks.push(omitUndefined({
 					binding: name,
 					network_id: binding.networkId,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "web-search":
 				result.websearch = omitUndefined({
 					binding: name,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				});
 				break;
 			case "worker":
 				services.push(omitUndefined({
 					binding: name,
-					service: binding.workerName,
+					service: binding.worker,
 					entrypoint: binding.exportName,
 					props: binding.props,
-					remote: binding.remote
+					remote: binding.dev?.remote
 				}));
 				break;
 			case "worker-loader":
@@ -3617,8 +3632,8 @@ function convertTailConsumers(config, result) {
 	if (!consumers || consumers.length === 0) return;
 	const tail = [];
 	const streaming = [];
-	for (const consumer of consumers) if (consumer.streaming) streaming.push({ service: consumer.workerName });
-	else tail.push({ service: consumer.workerName });
+	for (const consumer of consumers) if (consumer.streaming) streaming.push({ service: consumer.worker });
+	else tail.push({ service: consumer.worker });
 	if (tail.length) result.tail_consumers = tail;
 	if (streaming.length) result.streaming_tail_consumers = streaming;
 }
@@ -3776,4 +3791,4 @@ async function loadAndValidateConfig(configPath, ctx, options) {
 }
 
 //#endregion
-export { AnalyticsEngineDatasetBindingSchema, AssetsSchema, BindingSchema, BrowserBindingSchema, ConfigExportsSchema, D1BindingSchema, DurableObjectCreatedExportSchema, DurableObjectDeletedExportSchema, DurableObjectExpectingTransferExportSchema, DurableObjectRenamedExportSchema, DurableObjectTransferredExportSchema, ExportSchema, FlagshipBindingSchema, HyperdriveBindingSchema, InputWorkerSchema, KVBindingSchema, KnownBindingSchema, ModuleTypeSchema, OutputWorkerSchema, QueueBindingSchema, R2BindingSchema, SettingsSchema, TailConsumerSchema, UnsafeBindingSchema, WorkerBindingSchema, WorkerEntrypointExportSchema, bindings, convertToWranglerConfig, defineSettings, defineWorker, exports$1 as exports, generateTypes, loadAndValidateConfig, loadConfig, registerConfigHooks, resolveExportDefinition, triggers, validateSingletonBindings };
+export { AnalyticsEngineDatasetBindingSchema, AssetsSchema, BindingSchema, BrowserBindingSchema, ConfigExportsSchema, D1BindingSchema, DurableObjectCreatedExportSchema, DurableObjectDeletedExportSchema, DurableObjectExpectingTransferExportSchema, DurableObjectRenamedExportSchema, DurableObjectTransferredExportSchema, ExportSchema, FlagshipBindingSchema, HyperdriveBindingSchema, InputSettingsSchema, InputWorkerSchema, KVBindingSchema, KnownBindingSchema, ModuleTypeSchema, OutputSettingsSchema, OutputWorkerSchema, QueueBindingSchema, R2BindingSchema, TailConsumerSchema, UnsafeBindingSchema, WorkerBindingSchema, WorkerEntrypointExportSchema, bindings, convertToWranglerConfig, defineSettings, defineWorker, exports$1 as exports, generateTypes, loadAndValidateConfig, loadConfig, registerConfigHooks, resolveExportDefinition, triggers, validateSingletonBindings };