wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/configuration.test.ts

@@ -40,6 +40,7 @@ describe("normalizeAndValidateConfig()", () => {
 			jsx_fragment: "React.Fragment",
 			tsconfig: undefined,
 			kv_namespaces: [],
+			send_email: [],
 			legacy_env: true,
 			logfwdr: {
 				bindings: [],
@@ -55,6 +56,7 @@ describe("normalizeAndValidateConfig()", () => {
 			},
 			r2_buckets: [],
 			services: [],
+			analytics_engine_datasets: [],
 			route: undefined,
 			routes: undefined,
 			rules: [],
@@ -64,12 +66,13 @@ describe("normalizeAndValidateConfig()", () => {
 				crons: [],
 			},
 			unsafe: {
-				bindings: [],
+				bindings: undefined,
+				metadata: undefined,
 			},
 			dispatch_namespaces: [],
+			mtls_certificates: [],
 			usage_model: undefined,
 			vars: {},
-			metadata_binding: undefined,
 			define: {},
 			wasm_modules: undefined,
 			data_blobs: undefined,
@@ -901,6 +904,17 @@ describe("normalizeAndValidateConfig()", () => {
 						preview_id: "KV_PREVIEW_1",
 					},
 				],
+				send_email: [
+					{ name: "SEB_TARGET", destination_address: "teste@example.com" },
+					{ name: "SEB_UNRESTRICTED" },
+					{
+						name: "SEB_ALLOWLIST",
+						allowed_destination_addresses: [
+							"email1@example.com",
+							"email2@example.com",
+						],
+					},
+				],
 				r2_buckets: [
 					{ binding: "R2_BINDING_1", bucket_name: "R2_BUCKET_1" },
 					{
@@ -916,6 +930,15 @@ describe("normalizeAndValidateConfig()", () => {
 						environment: "SERVICE_BINDING_ENVIRONMENT_1",
 					},
 				],
+				analytics_engine_datasets: [
+					{
+						binding: "AE_BINDING_1",
+						dataset: "DATASET_1",
+					},
+					{
+						binding: "AE_BINDING_2",
+					},
+				],
 				unsafe: {
 					bindings: [
 						{ name: "UNSAFE_BINDING_1", type: "UNSAFE_TYPE_1" },
@@ -925,6 +948,7 @@ describe("normalizeAndValidateConfig()", () => {
 							extra: "UNSAFE_EXTRA_1",
 						},
 					],
+					metadata: undefined,
 				},
 				no_bundle: true,
 				minify: true,
@@ -1617,6 +1641,39 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		it("should error if send_email.bindings are not valid", () => {
+			const { diagnostics } = normalizeAndValidateConfig(
+				{
+					send_email: [
+						{},
+						{ binding: "VALID" },
+						{ name: "SEB", destination_address: 123 },
+						{
+							name: "SEB2",
+							allowed_destination_addresses: 123,
+						},
+						{
+							name: "SEB3",
+							destination_address: "email@example.com",
+							allowed_destination_addresses: ["email@example.com"],
+						},
+					],
+				} as unknown as RawConfig,
+				undefined,
+				{ env: undefined }
+			);
+
+			expect(diagnostics.hasWarnings()).toBe(false);
+			expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+			            - \\"send_email[0]\\" bindings should have a string \\"name\\" field but got {}.
+			            - \\"send_email[1]\\" bindings should have a string \\"name\\" field but got {\\"binding\\":\\"VALID\\"}.
+			            - \\"send_email[2]\\" bindings should, optionally, have a string \\"destination_address\\" field but got {\\"name\\":\\"SEB\\",\\"destination_address\\":123}.
+			            - \\"send_email[3]\\" bindings should, optionally, have a []string \\"allowed_destination_addresses\\" field but got {\\"name\\":\\"SEB2\\",\\"allowed_destination_addresses\\":123}.
+			            - \\"send_email[4]\\" bindings should have either a \\"destination_address\\" or \\"allowed_destination_addresses\\" field, but not both."
+		        `);
+		});
+
 		describe("[d1_databases]", () => {
 			it("should error if d1_databases is an object", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
@@ -1779,6 +1836,7 @@ describe("normalizeAndValidateConfig()", () => {
 									max_batch_timeout: null,
 									max_retries: "hello",
 									dead_letter_queue: 5,
+									max_concurrency: "hello",
 								},
 							],
 						},
@@ -1794,20 +1852,21 @@ describe("normalizeAndValidateConfig()", () => {
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-					"Processing wrangler configuration:
-					  - Unexpected fields found in queues field: \\"invalidField\\"
-					  - Unexpected fields found in queues.consumers[2] field: \\"invalidField\\""
-				`);
+			"Processing wrangler configuration:
+			  - Unexpected fields found in queues field: \\"invalidField\\"
+			  - Unexpected fields found in queues.consumers[2] field: \\"invalidField\\""
+		`);
 
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-					"Processing wrangler configuration:
-					  - \\"queues.consumers[0]\\" should have a string \\"queue\\" field but got {}.
-					  - \\"queues.consumers[1]\\" should have a string \\"queue\\" field but got {\\"queue\\":22}.
-					  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_batch_size\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5}.
-					  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_batch_timeout\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5}.
-					  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_retries\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5}.
-					  - \\"queues.consumers[3]\\" should, optionally, have a string \\"dead_letter_queue\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5}."
-				`);
+			"Processing wrangler configuration:
+			  - \\"queues.consumers[0]\\" should have a string \\"queue\\" field but got {}.
+			  - \\"queues.consumers[1]\\" should have a string \\"queue\\" field but got {\\"queue\\":22}.
+			  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_batch_size\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5,\\"max_concurrency\\":\\"hello\\"}.
+			  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_batch_timeout\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5,\\"max_concurrency\\":\\"hello\\"}.
+			  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_retries\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5,\\"max_concurrency\\":\\"hello\\"}.
+			  - \\"queues.consumers[3]\\" should, optionally, have a string \\"dead_letter_queue\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5,\\"max_concurrency\\":\\"hello\\"}.
+			  - \\"queues.consumers[3]\\" should, optionally, have a number \\"max_concurrency\\" field but got {\\"queue\\":\\"myQueue\\",\\"max_batch_size\\":\\"3\\",\\"max_batch_timeout\\":null,\\"max_retries\\":\\"hello\\",\\"dead_letter_queue\\":5,\\"max_concurrency\\":\\"hello\\"}."
+		`);
 			});
 		});
 
@@ -2029,28 +2088,93 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
-		describe("[dispatch_namespaces]", () => {
-			it("should log an experimental warning when dispatch_namespaces is used", () => {
+		describe("[analytics_engine_datasets]", () => {
+			it("should error if analytics_engine_datasets is an object", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: {} } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got {}."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: "BAD" } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got \\"BAD\\"."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: 999 } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got 999."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: null } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got null."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets.bindings are not valid", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{
-						dispatch_namespaces: [
+						analytics_engine_datasets: [
+							{},
+							{ binding: 2333, dataset: 2444 },
 							{
-								binding: "BINDING_1",
-								namespace: "NAMESPACE_1",
+								binding: "AE_BINDING_2",
+								dataset: 2555,
 							},
+							{ binding: "AE_BINDING_1", dataset: "" },
 						],
 					} as unknown as RawConfig,
 					undefined,
 					{ env: undefined }
 				);
-				expect(diagnostics.hasWarnings()).toBe(true);
-				expect(diagnostics.hasErrors()).toBe(false);
-				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
-		`);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+			            - \\"analytics_engine_datasets[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			            - \\"analytics_engine_datasets[1]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			            - \\"analytics_engine_datasets[1]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			            - \\"analytics_engine_datasets[2]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_2\\",\\"dataset\\":2555}.
+			            - \\"analytics_engine_datasets[3]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_1\\",\\"dataset\\":\\"\\"}."
+		        `);
 			});
+		});
 
+		describe("[dispatch_namespaces]", () => {
 			it("should error if dispatch_namespaces is not an array", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{
@@ -2060,12 +2184,8 @@ describe("normalizeAndValidateConfig()", () => {
 					{ env: undefined }
 				);
 
-				expect(diagnostics.hasWarnings()).toBe(true);
+				expect(diagnostics.hasWarnings()).toBe(false);
 				expect(diagnostics.hasErrors()).toBe(true);
-				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			          "Processing wrangler configuration:
-			            - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
-		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
 			  - The field \\"dispatch_namespaces\\" should be an array but got \\"just a string\\"."
@@ -2104,12 +2224,8 @@ describe("normalizeAndValidateConfig()", () => {
 					undefined,
 					{ env: undefined }
 				);
-				expect(diagnostics.hasWarnings()).toBe(true);
+				expect(diagnostics.hasWarnings()).toBe(false);
 				expect(diagnostics.hasErrors()).toBe(true);
-				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
-		`);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
 			  - \\"dispatch_namespaces[0]\\" binding should be objects, but got \\"a string\\"
@@ -2124,6 +2240,75 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[mtls_certificates]", () => {
+			it("should error if mtls_certificates is not an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						mtls_certificates: "just a string",
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.hasErrors()).toBe(true);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"mtls_certificates\\" should be an array but got \\"just a string\\"."
+		`);
+			});
+
+			it("should error on non valid mtls_certificates", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						mtls_certificates: [
+							"a string",
+							123,
+							false,
+							{
+								binding: 123,
+								namespace: 123,
+							},
+							{
+								binding: "CERT_ONE",
+								id: "1234",
+							},
+							{
+								binding: "CERT_TWO",
+								certificate_id: 1234,
+							},
+							// this one is valid
+							{
+								binding: "CERT_THREE",
+								certificate_id: "1234",
+							},
+							{
+								binding: true,
+								service: "1234",
+							},
+						],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.hasErrors()).toBe(true);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"mtls_certificates\\" bindings should be objects, but got \\"a string\\"
+			  - \\"mtls_certificates\\" bindings should be objects, but got 123
+			  - \\"mtls_certificates\\" bindings should be objects, but got false
+			  - \\"mtls_certificates[3]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":123}.
+			  - \\"mtls_certificates[3]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":123,\\"namespace\\":123}.
+			  - \\"mtls_certificates[4]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":\\"CERT_ONE\\",\\"id\\":\\"1234\\"}.
+			  - \\"mtls_certificates[5]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":\\"CERT_TWO\\",\\"certificate_id\\":1234}.
+			  - \\"mtls_certificates[7]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":true,\\"service\\":\\"1234\\"}.
+			  - \\"mtls_certificates[7]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":true,\\"service\\":\\"1234\\"}."
+		`);
+			});
+		});
+
 		describe("[unsafe.bindings]", () => {
 			it("should error if unsafe is an array", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
@@ -2193,7 +2378,7 @@ describe("normalizeAndValidateConfig()", () => {
 		              `);
 			});
 
-			it("should error if unsafe.bindings is not defined", () => {
+			it("should error if neither unsafe.bindings nor unsafe.metadata are defined", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{ unsafe: {} } as unknown as RawConfig,
 					undefined,
@@ -2205,9 +2390,37 @@ describe("normalizeAndValidateConfig()", () => {
 			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
 		              `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"unsafe\\" should contain at least one of \\"bindings\\" or \\"metadata\\" properties but got {}."
+		`);
+			});
+
+			it("should not error if at least unsafe.bindings is defined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { bindings: [] } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			                  "Processing wrangler configuration:
-			                    - The field \\"unsafe\\" is missing the required \\"bindings\\" property."
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
+
+			it("should not error if at least unsafe.metadata is defined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: {} } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
 		              `);
+				expect(diagnostics.hasErrors()).toBe(false);
 			});
 
 			it("should error if unsafe.bindings is an object", () => {
@@ -2317,6 +2530,74 @@ describe("normalizeAndValidateConfig()", () => {
 			              - binding should have a string \\"type\\" field."
 		        `);
 			});
+
+			it("should error if unsafe.metadata is an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: [] } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"unsafe.metadata\\" should be an object but got []."
+		`);
+			});
+
+			it("should error if unsafe.metadata is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: "BAD" } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got \\"BAD\\"."
+		              `);
+			});
+
+			it("should error if unsafe.metadata is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: 999 } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got 999."
+		              `);
+			});
+
+			it("should error if unsafe.metadata is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: null } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got null."
+		              `);
+			});
 		});
 
 		describe("(deprecated)", () => {
@@ -2490,7 +2771,6 @@ describe("normalizeAndValidateConfig()", () => {
 				minify: false,
 				node_compat: false,
 				first_party_worker: false,
-				metadata_binding: "METADATA_ENV",
 				logpush: false,
 			};
 			const rawConfig: RawConfig = {
@@ -2515,7 +2795,6 @@ describe("normalizeAndValidateConfig()", () => {
 				minify: true,
 				node_compat: true,
 				first_party_worker: true,
-				metadata_binding: "METADATA_RAW",
 				logpush: true,
 				env: {
 					ENV1: rawEnv,
@@ -2700,16 +2979,20 @@ describe("normalizeAndValidateConfig()", () => {
 			};
 			const kv_namespaces: RawConfig["kv_namespaces"] = [];
 			const r2_buckets: RawConfig["r2_buckets"] = [];
-			const unsafe: RawConfig["unsafe"] = { bindings: [] };
-			const metadata_binding: RawConfig["metadata_binding"] = "";
+			const analytics_engine_datasets: RawConfig["analytics_engine_datasets"] =
+				[];
+			const unsafe: RawConfig["unsafe"] = {
+				bindings: undefined,
+				metadata: undefined,
+			};
 			const rawConfig: RawConfig = {
 				define,
 				vars,
 				durable_objects,
 				kv_namespaces,
 				r2_buckets,
+				analytics_engine_datasets,
 				unsafe,
-				metadata_binding,
 				env: {
 					ENV1: {},
 				},
@@ -2728,6 +3011,7 @@ describe("normalizeAndValidateConfig()", () => {
 					durable_objects,
 					kv_namespaces,
 					r2_buckets,
+					analytics_engine_datasets,
 					unsafe,
 				})
 			);
@@ -2739,9 +3023,6 @@ describe("normalizeAndValidateConfig()", () => {
 			    - \\"vars\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"vars\\" is not inherited by environments.
 			      Please add \\"vars\\" to \\"env.ENV1\\".
-			    - \\"metadata_binding\\" exists at the top level, but not on \\"env.ENV1\\".
-			      This is not what you probably want, since \\"metadata_binding\\" is not inherited by environments.
-			      Please add \\"metadata_binding\\" to \\"env.ENV1\\".
 			    - \\"define\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"define\\" is not inherited by environments.
 			      Please add \\"define\\" to \\"env.ENV1\\".
@@ -2754,6 +3035,9 @@ describe("normalizeAndValidateConfig()", () => {
 			    - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
 			      Please add \\"r2_buckets\\" to \\"env.ENV1\\".
+			    - \\"analytics_engine_datasets\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"analytics_engine_datasets\\" is not inherited by environments.
+			      Please add \\"analytics_engine_datasets\\" to \\"env.ENV1\\".
 			    - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
 			      Please add \\"unsafe\\" to \\"env.ENV1\\"."
@@ -3455,6 +3739,114 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[analytics_engine_datasets]", () => {
+			it("should error if analytics_engine_datasets is an object", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: {} } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got {}."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: "BAD" } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got \\"BAD\\"."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: 999 } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got 999."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: null } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got null."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets.bindings are not valid", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: {
+							ENV1: {
+								analytics_engine_datasets: [
+									{},
+									{ binding: 2333, dataset: 2444 },
+									{
+										binding: "AE_BINDING_2",
+										dataset: 2555,
+									},
+									{ binding: "AE_BINDING_1", dataset: "" },
+								],
+							},
+						},
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"env.ENV1.analytics_engine_datasets[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			              - \\"env.ENV1.analytics_engine_datasets[1]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			              - \\"env.ENV1.analytics_engine_datasets[1]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			              - \\"env.ENV1.analytics_engine_datasets[2]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_2\\",\\"dataset\\":2555}.
+			              - \\"env.ENV1.analytics_engine_datasets[3]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_1\\",\\"dataset\\":\\"\\"}."
+		        `);
+			});
+		});
+
 		describe("[unsafe.bindings]", () => {
 			it("should error if unsafe is an array", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
@@ -3540,7 +3932,7 @@ describe("normalizeAndValidateConfig()", () => {
 		        `);
 			});
 
-			it("should error if unsafe.bindings is not defined", () => {
+			it("should error if neither unsafe.bindings nor unsafe.metadata are defined", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{ env: { ENV1: { unsafe: {} } } } as unknown as RawConfig,
 					undefined,
@@ -3554,11 +3946,47 @@ describe("normalizeAndValidateConfig()", () => {
 			              - \\"unsafe\\" fields are experimental and may change or break at any time."
 		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe\\" should contain at least one of \\"bindings\\" or \\"metadata\\" properties but got {}."
+		`);
+			});
+
+			it("should not error if at least unsafe.bindings is undefined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { bindings: [] } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			          "Processing wrangler configuration:
 
 			            - \\"env.ENV1\\" environment configuration
-			              - The field \\"env.ENV1.unsafe\\" is missing the required \\"bindings\\" property."
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
 		        `);
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
+
+			it("should not error if at least unsafe.metadata is undefined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: {} } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.hasErrors()).toBe(false);
 			});
 
 			it("should error if unsafe.bindings is an object", () => {
@@ -3700,6 +4128,98 @@ describe("normalizeAndValidateConfig()", () => {
 			                - binding should have a string \\"type\\" field."
 		        `);
 			});
+
+			it("should error if unsafe.metadata is an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: [] } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got []."
+		        `);
+			});
+
+			it("should error if unsafe.metadata is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: "BAD" } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got \\"BAD\\"."
+		`);
+			});
+
+			it("should error if unsafe.metadata is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: 999 } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got 999."
+		`);
+			});
+
+			it("should error if unsafe.metadata is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: null } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got null."
+		`);
+			});
 		});
 
 		describe("(deprecated)", () => {
@@ -3979,45 +4499,6 @@ describe("normalizeAndValidateConfig()", () => {
 				expect(result2.diagnostics.hasWarnings()).toBe(false);
 			});
 		});
-		describe("[metadata_binding]", () => {
-			it("should error if metadata_binding is a number", () => {
-				const { diagnostics } = normalizeAndValidateConfig(
-					{ env: { ENV1: { metadata_binding: 999 } } } as unknown as RawConfig,
-					undefined,
-					{ env: "ENV1" }
-				);
-
-				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-			"
-		`);
-				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-
-			  - \\"env.ENV1\\" environment configuration
-			    - Expected \\"metadata_binding\\" to be of type string but got 999."
-		`);
-			});
-
-			it("should error if metadata_binding is null", () => {
-				const { diagnostics } = normalizeAndValidateConfig(
-					{ env: { ENV1: { metadata_binding: null } } } as unknown as RawConfig,
-					undefined,
-					{ env: "ENV1" }
-				);
-
-				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-			"
-		`);
-				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-
-			  - \\"env.ENV1\\" environment configuration
-			    - Expected \\"metadata_binding\\" to be of type string but got null."
-		`);
-			});
-		});
 	});
 });