wrangler 0.0.0-e2b7352 → 0.0.0-e2f9bb2

package/src/__tests__/configuration.test.ts

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { normalizeAndValidateConfig } from "../config/validation";
+import { normalizeSlashes } from "./helpers/mock-console";
 import type {
   ConfigFields,
   RawDevConfig,
@@ -56,6 +57,7 @@ describe("normalizeAndValidateConfig()", () => {
       usage_model: undefined,
       vars: {},
       wasm_modules: undefined,
+      data_blobs: undefined,
       workers_dev: undefined,
       zone_id: undefined,
     });
@@ -138,7 +140,7 @@ describe("normalizeAndValidateConfig()", () => {
       `);
     });
 
-    it("should ignore `miniflare` top level fields", () => {
+    it("should report a deprecation warning if `miniflare` appears at the top level", () => {
       const expectedConfig = {
         miniflare: {
           host: "localhost",
@@ -155,7 +157,8 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasErrors()).toBe(false);
       expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
-        "
+          - 😶 Ignored: \\"miniflare\\":
+            Wrangler does not use configuration in the \`miniflare\` section. Unless you are using Miniflare directly you can remove this section."
       `);
     });
 
@@ -228,8 +231,9 @@ describe("normalizeAndValidateConfig()", () => {
         const expectedConfig: RawConfig = {
           site: {
             bucket: "BUCKET",
-            include: ["INCLUDE_1", "INCLUDE_2"],
+            "entry-point": "my-site",
             exclude: ["EXCLUDE_1", "EXCLUDE_2"],
+            include: ["INCLUDE_1", "INCLUDE_2"],
           },
         };
 
@@ -241,13 +245,24 @@ describe("normalizeAndValidateConfig()", () => {
 
         expect(config).toEqual(expect.objectContaining(expectedConfig));
         expect(diagnostics.hasErrors()).toBe(false);
-        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
+
+        expect(normalizeSlashes(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"my-site/index.js\\"
+              \`\`\`"
+        `);
       });
 
       it("should error if `site` config is missing `bucket`", () => {
         const expectedConfig: RawConfig = {
           // @ts-expect-error we're intentionally passing an invalid configuration here
           site: {
+            "entry-point": "workers-site",
             include: ["INCLUDE_1", "INCLUDE_2"],
             exclude: ["EXCLUDE_1", "EXCLUDE_2"],
           },
@@ -260,18 +275,30 @@ describe("normalizeAndValidateConfig()", () => {
         );
 
         expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.hasErrors()).toBe(true);
+
+        expect(normalizeSlashes(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"workers-site/index.js\\"
+              \`\`\`"
+        `);
+
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
             - \\"site.bucket\\" is a required field."
         `);
-        expect(diagnostics.hasWarnings()).toBe(false);
       });
 
       it("should error on invalid `site` values", () => {
         const expectedConfig = {
           site: {
             bucket: "BUCKET",
+            "entry-point": 111,
             include: [222, 333],
             exclude: [444, 555],
           },
@@ -284,17 +311,28 @@ describe("normalizeAndValidateConfig()", () => {
         );
 
         expect(config).toEqual(expect.objectContaining(expectedConfig));
-        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
             - Expected \\"sites.include.[0]\\" to be of type string but got 222.
             - Expected \\"sites.include.[1]\\" to be of type string but got 333.
             - Expected \\"sites.exclude.[0]\\" to be of type string but got 444.
-            - Expected \\"sites.exclude.[1]\\" to be of type string but got 555."
+            - Expected \\"sites.exclude.[1]\\" to be of type string but got 555.
+            - Expected \\"site.entry-point\\" to be of type string but got 111."
+        `);
+
+        expect(normalizeSlashes(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"111/index.js\\"
+              \`\`\`"
         `);
       });
 
-      it("should error with a deprecation warning if entry-point is defined", async () => {
+      it("should log a deprecation warning if entry-point is defined", async () => {
         const { config, diagnostics } = normalizeAndValidateConfig(
           {
             site: {
@@ -309,21 +347,22 @@ describe("normalizeAndValidateConfig()", () => {
         expect(config.site).toMatchInlineSnapshot(`
           Object {
             "bucket": "some/path",
+            "entry-point": "some/other/script.js",
             "exclude": Array [],
             "include": Array [],
           }
         `);
         expect(diagnostics.hasWarnings()).toBe(true);
-        expect(diagnostics.hasErrors()).toBe(true);
-        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-          "Processing wrangler configuration:
-            - Unexpected fields found in site field: \\"entry-point\\""
-        `);
-        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        expect(diagnostics.hasErrors()).toBe(false);
+
+        expect(normalizeSlashes(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"site.entry-point\\":
-              The \`site.entry-point\` config field is no longer used.
-              The entry-point should be specified via the command line or the \`main\` config field."
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"some/other/script.js\\"
+              \`\`\`"
         `);
       });
     });
@@ -354,7 +393,7 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasWarnings()).toBe(false);
     });
 
-    it("should error on invalid `wasm_module` paths", () => {
+    it("should error on invalid `wasm_modules` paths", () => {
       const expectedConfig = {
         wasm_modules: {
           MODULE_1: 111,
@@ -434,6 +473,59 @@ describe("normalizeAndValidateConfig()", () => {
       `);
     });
 
+    it("should map `data_blobs` paths from relative to the config path to relative to the cwd", () => {
+      const expectedConfig: RawConfig = {
+        data_blobs: {
+          BLOB_1: "path/to/data1.bin",
+          BLOB_2: "data2.bin",
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        "project/wrangler.toml",
+        { env: undefined }
+      );
+
+      expect(config).toEqual(
+        expect.objectContaining({
+          data_blobs: {
+            BLOB_1: path.normalize("project/path/to/data1.bin"),
+            BLOB_2: path.normalize("project/data2.bin"),
+          },
+        })
+      );
+      expect(diagnostics.hasErrors()).toBe(false);
+      expect(diagnostics.hasWarnings()).toBe(false);
+    });
+
+    it("should error on invalid `data_blob` paths", () => {
+      const expectedConfig = {
+        data_blobs: {
+          MODULE_1: 111,
+          MODULE_2: 222,
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig as unknown as RawConfig,
+        "project/wrangler.toml",
+        { env: undefined }
+      );
+
+      expect(config).toEqual(
+        expect.objectContaining({
+          data_blobs: {},
+        })
+      );
+      expect(diagnostics.hasWarnings()).toBe(false);
+      expect(normalizePath(diagnostics.renderErrors())).toMatchInlineSnapshot(`
+        "Processing project/wrangler.toml configuration:
+          - Expected \\"data_blobs['MODULE_1']\\" to be of type string but got 111.
+          - Expected \\"data_blobs['MODULE_2']\\" to be of type string but got 222."
+      `);
+    });
+
     it("should resolve tsconfig relative to wrangler.toml", async () => {
       const expectedConfig: RawEnvironment = {
         tsconfig: "path/to/some-tsconfig.json",
@@ -478,12 +570,12 @@ describe("normalizeAndValidateConfig()", () => {
         expect(diagnostics.hasErrors()).toBe(false);
         expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-            "Processing wrangler configuration:
-              - DEPRECATION: \\"type\\":
-                DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.
-              - DEPRECATION: \\"webpack_config\\":
-                DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build."
-          `);
+          "Processing wrangler configuration:
+            - 😶 Ignored: \\"type\\":
+              Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.
+            - 😶 Ignored: \\"webpack_config\\":
+              Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build."
+        `);
       });
     });
   });
@@ -494,12 +586,17 @@ describe("normalizeAndValidateConfig()", () => {
       const resolvedMain = path.resolve(process.cwd(), main);
 
       const expectedConfig: RawEnvironment = {
-        name: "NAME",
+        name: "mock-name",
         account_id: "ACCOUNT_ID",
         compatibility_date: "2022-01-01",
         compatibility_flags: ["FLAG1", "FLAG2"],
         workers_dev: false,
-        routes: ["ROUTE_1", "ROUTE_2"],
+        routes: [
+          "ROUTE_1",
+          "ROUTE_2",
+          { pattern: "ROUTE3", zone_id: "ZONE_ID_3" },
+          "ROUTE_4",
+        ],
         jsx_factory: "JSX_FACTORY",
         jsx_fragment: "JSX_FRAGMENT",
         tsconfig: "path/to/tsconfig",
@@ -576,7 +673,26 @@ describe("normalizeAndValidateConfig()", () => {
         compatibility_date: 333,
         compatibility_flags: [444, 555],
         workers_dev: "BAD",
-        routes: [666, 777],
+        routes: [
+          666,
+          777,
+          // this one's valid, but we add it here to make sure
+          // it doesn't get included in the error message
+          "example.com/*",
+          { pattern: 123, zone_id: "zone_id_1" },
+          { pattern: "route_2", zone_id: 123 },
+          { pattern: "route_2", zone_name: 123 },
+          { pattern: "route_3" },
+          { zone_id: "zone_id_4" },
+          { zone_name: "zone_name_4" },
+          { pattern: undefined },
+          { pattern: "route_5", zone_id: "zone_id_5", some_other_key: 123 },
+          { pattern: "route_5", zone_name: "zone_name_5", some_other_key: 123 },
+          // this one's valid too
+          { pattern: "route_6", zone_id: "zone_id_6" },
+          // as well as this one
+          { pattern: "route_6", zone_name: "zone_name_6" },
+        ],
         route: 888,
         jsx_factory: 999,
         jsx_fragment: 1000,
@@ -601,8 +717,43 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasWarnings()).toBe(false);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
-          - Expected \\"route\\" to be of type string but got 888.
-          - Expected \\"routes\\" to be of type string array but got [666,777].
+          - Expected \\"route\\" to be either a string, or an object with shape { pattern, zone_id | zone_name }, but got 888.
+          - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, zone_id | zone_name }, but these weren't valid: [
+              666,
+              777,
+              {
+                \\"pattern\\": 123,
+                \\"zone_id\\": \\"zone_id_1\\"
+              },
+              {
+                \\"pattern\\": \\"route_2\\",
+                \\"zone_id\\": 123
+              },
+              {
+                \\"pattern\\": \\"route_2\\",
+                \\"zone_name\\": 123
+              },
+              {
+                \\"pattern\\": \\"route_3\\"
+              },
+              {
+                \\"zone_id\\": \\"zone_id_4\\"
+              },
+              {
+                \\"zone_name\\": \\"zone_name_4\\"
+              },
+              {},
+              {
+                \\"pattern\\": \\"route_5\\",
+                \\"zone_id\\": \\"zone_id_5\\",
+                \\"some_other_key\\": 123
+              },
+              {
+                \\"pattern\\": \\"route_5\\",
+                \\"zone_name\\": \\"zone_name_5\\",
+                \\"some_other_key\\": 123
+              }
+            ].
           - Expected exactly one of the following fields [\\"routes\\",\\"route\\"].
           - Expected \\"workers_dev\\" to be of type boolean but got \\"BAD\\".
           - Expected \\"build.command\\" to be of type string but got 1444.
@@ -614,12 +765,85 @@ describe("normalizeAndValidateConfig()", () => {
           - Expected \\"jsx_factory\\" to be of type string but got 999.
           - Expected \\"jsx_fragment\\" to be of type string but got 1000.
           - Expected \\"tsconfig\\" to be of type string but got true.
-          - Expected \\"name\\" to be of type string but got 111.
+          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got 111.
           - Expected \\"main\\" to be of type string but got 1333.
           - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
       `);
     });
 
+    it("should error on invalid `name` value with spaces", () => {
+      const expectedConfig: RawEnvironment = {
+        name: "NCC 1701 D",
+      } as unknown as RawEnvironment;
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        undefined,
+        { env: undefined }
+      );
+
+      expect(config).toEqual(expect.objectContaining(expectedConfig));
+      expect(diagnostics.hasWarnings()).toBe(false);
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"NCC 1701 D\\"."
+      `);
+    });
+
+    it("should be valid `name` with underscores", () => {
+      const expectedConfig: RawEnvironment = {
+        name: "enterprise_nx_01",
+      } as unknown as RawEnvironment;
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        undefined,
+        { env: undefined }
+      );
+
+      expect(config).toEqual(expect.objectContaining(expectedConfig));
+      expect(diagnostics.hasWarnings()).toBe(false);
+      expect(diagnostics.hasErrors()).toBe(false);
+    });
+
+    it("should error on invalid `name` value with special characters", () => {
+      const expectedConfig: RawEnvironment = {
+        name: "Thy'lek-Shran",
+      } as unknown as RawEnvironment;
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        undefined,
+        { env: undefined }
+      );
+
+      expect(config).toEqual(expect.objectContaining(expectedConfig));
+      expect(diagnostics.hasWarnings()).toBe(false);
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"Thy'lek-Shran\\"."
+      `);
+    });
+
+    it("should error on invalid `name` value with only special characters", () => {
+      const expectedConfig: RawEnvironment = {
+        name: "!@#$%^&*(()",
+      } as unknown as RawEnvironment;
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        undefined,
+        { env: undefined }
+      );
+
+      expect(config).toEqual(expect.objectContaining(expectedConfig));
+      expect(diagnostics.hasWarnings()).toBe(false);
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"!@#$%^&*(()\\"."
+      `);
+    });
+
     it("should override build.upload config defaults with provided values and warn about deprecations", () => {
       const expectedConfig: RawEnvironment = {
         build: {
@@ -645,17 +869,17 @@ describe("normalizeAndValidateConfig()", () => {
       expect(normalizePath(diagnostics.renderWarnings()))
         .toMatchInlineSnapshot(`
         "Processing project/wrangler.toml configuration:
-          - DEPRECATION: \\"build.upload.format\\":
+          - Deprecation: \\"build.upload.format\\":
             The format is inferred automatically from the code.
-          - DEPRECATION: \\"build.upload.main\\":
+          - Deprecation: \\"build.upload.main\\":
             Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
             Then add the top level \`main\` field to your configuration file:
             \`\`\`
             main = \\"src/index.ts\\"
             \`\`\`
-          - DEPRECATION: \\"build.upload.dir\\":
+          - Deprecation: \\"build.upload.dir\\":
             Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
-          - DEPRECATION: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
+          - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
             \`\`\`
             [[rules]]
             type = \\"Text\\"
@@ -1375,7 +1599,7 @@ describe("normalizeAndValidateConfig()", () => {
           zone_id: "ZONE_ID",
           experimental_services: [
             {
-              name: "NAME",
+              name: "mock-name",
               service: "SERVICE",
               environment: "ENV",
             },
@@ -1394,19 +1618,19 @@ describe("normalizeAndValidateConfig()", () => {
         expect(diagnostics.hasErrors()).toBe(false);
         expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-            "Processing wrangler configuration:
-              - DEPRECATION: \\"zone_id\\":
-                This is unnecessary since we can deduce this from routes directly.
-              - DEPRECATION: \\"experimental_services\\":
-                The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
-                \`\`\`
-                [[unsafe.bindings]]
-                name = \\"NAME\\"
-                type = \\"service\\"
-                service = \\"SERVICE\\"
-                environment = \\"ENV\\"
-                \`\`\`"
-          `);
+          "Processing wrangler configuration:
+            - Deprecation: \\"zone_id\\":
+              This is unnecessary since we can deduce this from routes directly.
+            - Deprecation: \\"experimental_services\\":
+              The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
+              \`\`\`
+              [[unsafe.bindings]]
+              name = \\"mock-name\\"
+              type = \\"service\\"
+              service = \\"SERVICE\\"
+              environment = \\"ENV\\"
+              \`\`\`"
+        `);
       });
     });
 
@@ -1481,7 +1705,7 @@ describe("normalizeAndValidateConfig()", () => {
       const main = "src/index.ts";
       const resolvedMain = path.resolve(process.cwd(), main);
       const rawConfig: RawConfig = {
-        name: "NAME",
+        name: "mock-name",
         account_id: "ACCOUNT_ID",
         compatibility_date: "2022-01-01",
         compatibility_flags: ["FLAG1", "FLAG2"],
@@ -1501,16 +1725,16 @@ describe("normalizeAndValidateConfig()", () => {
       };
 
       const { config, diagnostics } = normalizeAndValidateConfig(
-        { ...rawConfig, env: { DEV: {} } },
+        { ...rawConfig, env: { dev: {} } },
         undefined,
-        { env: "DEV" }
+        { env: "dev" }
       );
 
       expect(config).toEqual(
         expect.objectContaining({
           ...rawConfig,
           main: resolvedMain,
-          name: "NAME-DEV",
+          name: "mock-name-dev",
         })
       );
       expect(diagnostics.hasErrors()).toBe(false);
@@ -1521,7 +1745,7 @@ describe("normalizeAndValidateConfig()", () => {
       const main = "src/index.ts";
       const resolvedMain = path.resolve(process.cwd(), main);
       const rawEnv: RawEnvironment = {
-        name: "ENV_NAME",
+        name: "mock-env-name",
         account_id: "ENV_ACCOUNT_ID",
         compatibility_date: "2022-02-02",
         compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -1540,7 +1764,7 @@ describe("normalizeAndValidateConfig()", () => {
         },
       };
       const rawConfig: RawConfig = {
-        name: "NAME",
+        name: "mock-name",
         account_id: "ACCOUNT_ID",
         compatibility_date: "2022-01-01",
         compatibility_flags: ["FLAG1", "FLAG2"],
@@ -1578,7 +1802,7 @@ describe("normalizeAndValidateConfig()", () => {
     describe("non-legacy", () => {
       it("should use top-level `name` field", () => {
         const rawConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           legacy_env: false,
           env: { DEV: {} },
         };
@@ -1589,9 +1813,13 @@ describe("normalizeAndValidateConfig()", () => {
           { env: "DEV" }
         );
 
-        expect(config.name).toEqual("NAME");
+        expect(config.name).toEqual("mock-name");
         expect(diagnostics.hasErrors()).toBe(false);
-        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
       });
 
       it("should error if named environment contains a `name` field, even if there is no top-level name", () => {
@@ -1599,7 +1827,7 @@ describe("normalizeAndValidateConfig()", () => {
           legacy_env: false,
           env: {
             DEV: {
-              name: "ENV_NAME",
+              name: "mock-env-name",
             },
           },
         };
@@ -1611,6 +1839,12 @@ describe("normalizeAndValidateConfig()", () => {
         );
 
         expect(config.name).toBeUndefined();
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -1618,16 +1852,15 @@ describe("normalizeAndValidateConfig()", () => {
               - The \\"name\\" field is not allowed in named service environments.
                 Please remove the field from this environment."
         `);
-        expect(diagnostics.hasWarnings()).toBe(false);
       });
 
       it("should error if top-level config and a named environment both contain a `name` field", () => {
         const rawConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           legacy_env: false,
           env: {
             DEV: {
-              name: "ENV_NAME",
+              name: "mock-env-name",
             },
           },
         };
@@ -1638,7 +1871,13 @@ describe("normalizeAndValidateConfig()", () => {
           { env: "DEV" }
         );
 
-        expect(config.name).toEqual("NAME");
+        expect(config.name).toEqual("mock-name");
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -1646,10 +1885,73 @@ describe("normalizeAndValidateConfig()", () => {
               - The \\"name\\" field is not allowed in named service environments.
                 Please remove the field from this environment."
         `);
-        expect(diagnostics.hasWarnings()).toBe(false);
       });
     });
 
+    it("should error if named environment contains a `account_id` field, even if there is no top-level name", () => {
+      const rawConfig: RawConfig = {
+        legacy_env: false,
+        env: {
+          DEV: {
+            account_id: "some_account_id",
+          },
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        rawConfig,
+        undefined,
+        { env: "DEV" }
+      );
+
+      expect(diagnostics.hasWarnings()).toBe(true);
+      expect(config.account_id).toBeUndefined();
+      expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+      `);
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+
+          - \\"env.DEV\\" environment configuration
+            - The \\"account_id\\" field is not allowed in named service environments.
+              Please remove the field from this environment."
+      `);
+    });
+
+    it("should error if top-level config and a named environment both contain a `account_id` field", () => {
+      const rawConfig: RawConfig = {
+        account_id: "ACCOUNT_ID",
+        legacy_env: false,
+        env: {
+          DEV: {
+            account_id: "ENV_ACCOUNT_ID",
+          },
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        rawConfig,
+        undefined,
+        { env: "DEV" }
+      );
+
+      expect(config.account_id).toEqual("ACCOUNT_ID");
+      expect(diagnostics.hasErrors()).toBe(true);
+      expect(diagnostics.hasWarnings()).toBe(true);
+      expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+      `);
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+
+          - \\"env.DEV\\" environment configuration
+            - The \\"account_id\\" field is not allowed in named service environments.
+              Please remove the field from this environment."
+      `);
+    });
+
     it("should warn for non-inherited fields that are missing in environments", () => {
       const vars: RawConfig["vars"] = {
         FOO: "foo",
@@ -1743,8 +2045,11 @@ describe("normalizeAndValidateConfig()", () => {
         "Processing wrangler configuration:
 
           - \\"env.ENV1\\" environment configuration
-            - Expected \\"route\\" to be of type string but got 888.
-            - Expected \\"routes\\" to be of type string array but got [666,777].
+            - Expected \\"route\\" to be either a string, or an object with shape { pattern, zone_id | zone_name }, but got 888.
+            - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, zone_id | zone_name }, but these weren't valid: [
+                666,
+                777
+              ].
             - Expected exactly one of the following fields [\\"routes\\",\\"route\\"].
             - Expected \\"workers_dev\\" to be of type boolean but got \\"BAD\\".
             - Expected \\"build.command\\" to be of type string but got 1444.
@@ -1756,7 +2061,7 @@ describe("normalizeAndValidateConfig()", () => {
             - Expected \\"jsx_factory\\" to be of type string but got 999.
             - Expected \\"jsx_fragment\\" to be of type string but got 1000.
             - Expected \\"tsconfig\\" to be of type string but got 123.
-            - Expected \\"name\\" to be of type string but got 111.
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got 111.
             - Expected \\"main\\" to be of type string but got 1333.
             - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
       `);
@@ -2535,7 +2840,7 @@ describe("normalizeAndValidateConfig()", () => {
           zone_id: "ZONE_ID",
           experimental_services: [
             {
-              name: "NAME",
+              name: "mock-name",
               service: "SERVICE",
               environment: "ENV",
             },
@@ -2561,13 +2866,13 @@ describe("normalizeAndValidateConfig()", () => {
           "Processing wrangler configuration:
 
             - \\"env.ENV1\\" environment configuration
-              - DEPRECATION: \\"zone_id\\":
+              - Deprecation: \\"zone_id\\":
                 This is unnecessary since we can deduce this from routes directly.
-              - DEPRECATION: \\"experimental_services\\":
+              - Deprecation: \\"experimental_services\\":
                 The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
                 \`\`\`
                 [[unsafe.bindings]]
-                name = \\"NAME\\"
+                name = \\"mock-name\\"
                 type = \\"service\\"
                 service = \\"SERVICE\\"
                 environment = \\"ENV\\"
@@ -2579,7 +2884,7 @@ describe("normalizeAndValidateConfig()", () => {
     describe("route & routes fields", () => {
       it("should error if both route and routes are specified in the same environment", () => {
         const environment: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2592,7 +2897,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const expectedConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           account_id: "ACCOUNT_ID",
           compatibility_date: "2022-01-01",
           compatibility_flags: ["FLAG1", "FLAG2"],
@@ -2627,7 +2932,7 @@ describe("normalizeAndValidateConfig()", () => {
 
       it("should error if both route and routes are specified in the top-level environment", () => {
         const environment: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2639,7 +2944,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const expectedConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           account_id: "ACCOUNT_ID",
           compatibility_date: "2022-01-01",
           compatibility_flags: ["FLAG1", "FLAG2"],
@@ -2673,7 +2978,7 @@ describe("normalizeAndValidateConfig()", () => {
 
       it("should not error if <env>.route and <top-level>.routes are specified", () => {
         const environment: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2685,7 +2990,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const expectedConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           account_id: "ACCOUNT_ID",
           compatibility_date: "2022-01-01",
           compatibility_flags: ["FLAG1", "FLAG2"],
@@ -2713,7 +3018,7 @@ describe("normalizeAndValidateConfig()", () => {
 
       it("should not error if <env>.routes and <top-level>.route are specified", () => {
         const environment: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2725,7 +3030,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const expectedConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           account_id: "ACCOUNT_ID",
           compatibility_date: "2022-01-01",
           compatibility_flags: ["FLAG1", "FLAG2"],
@@ -2753,7 +3058,7 @@ describe("normalizeAndValidateConfig()", () => {
 
       it("should not error if <env1>.route and <env2>.routes are specified", () => {
         const environment1: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2765,7 +3070,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const environment2: RawEnvironment = {
-          name: "ENV_NAME",
+          name: "mock-env-name",
           account_id: "ENV_ACCOUNT_ID",
           compatibility_date: "2022-02-02",
           compatibility_flags: ["ENV_FLAG1", "ENV_FLAG2"],
@@ -2777,7 +3082,7 @@ describe("normalizeAndValidateConfig()", () => {
           usage_model: "unbound",
         };
         const expectedConfig: RawConfig = {
-          name: "NAME",
+          name: "mock-name",
           account_id: "ACCOUNT_ID",
           compatibility_date: "2022-01-01",
           compatibility_flags: ["FLAG1", "FLAG2"],