wrangler 0.0.0-cc2adc2e → 0.0.0-cc335ee1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-cc2adc2e",
+	"version": "0.0.0-cc335ee1",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -102,13 +102,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.13.0",
-		"@miniflare/d1": "2.13.0",
-		"@miniflare/durable-objects": "2.13.0",
+		"@miniflare/core": "2.14.0",
+		"@miniflare/d1": "2.14.0",
+		"@miniflare/durable-objects": "2.14.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
-		"miniflare": "2.13.0",
+		"miniflare": "2.14.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",

package/src/__tests__/configuration.test.ts

@@ -26,6 +26,7 @@ describe("normalizeAndValidateConfig()", () => {
 			compatibility_flags: [],
 			configPath: undefined,
 			d1_databases: [],
+			constellation: [],
 			dev: {
 				ip: "0.0.0.0",
 				local_protocol: "http",
@@ -1831,6 +1832,100 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[constellation]", () => {
+			it("should error if constellation is an object", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ constellation: {} } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"constellation\\" should be an array but got {}."
+		`);
+			});
+
+			it("should error if constellation is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ constellation: "BAD" } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"constellation\\" should be an array but got \\"BAD\\"."
+		`);
+			});
+
+			it("should error if constellation is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ constellation: 999 } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"constellation\\" should be an array but got 999."
+		`);
+			});
+
+			it("should error if constellation is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ constellation: null } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"constellation\\" should be an array but got null."
+		`);
+			});
+
+			it("should accept valid bindings", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						constellation: [{ binding: "VALID", project_id: "ID" }],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
+
+			it("should error if constellation.bindings are not valid", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						constellation: [
+							{},
+							{ binding: "VALID" },
+							{ binding: 2000, project: 2111 },
+						],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"constellation[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			  - \\"constellation[0]\\" bindings must have a \\"project_id\\" field but got {}.
+			  - \\"constellation[1]\\" bindings must have a \\"project_id\\" field but got {\\"binding\\":\\"VALID\\"}.
+			  - \\"constellation[2]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2000,\\"project\\":2111}.
+			  - \\"constellation[2]\\" bindings must have a \\"project_id\\" field but got {\\"binding\\":2000,\\"project\\":2111}."
+		`);
+			});
+		});
+
 		describe("[queues]", () => {
 			it("should error if queues is not an object", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(

package/src/__tests__/constellation.test.ts

@@ -20,7 +20,7 @@ describe("constellation help", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 		"wrangler constellation
 
-		🤖 Interact with Constellation AI models
+		🤖 Interact with Constellation models
 
 		Commands:
 		  wrangler constellation project  Manage your projects
@@ -51,7 +51,7 @@ describe("constellation help", () => {
 		"
 		wrangler constellation
 
-		🤖 Interact with Constellation AI models
+		🤖 Interact with Constellation models
 
 		Commands:
 		  wrangler constellation project  Manage your projects
@@ -94,7 +94,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation project create new_project ONNX");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -108,7 +108,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation project list");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -131,7 +131,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation project delete new_project3");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -147,7 +147,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation catalog list");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -165,7 +165,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation runtime list");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -188,7 +188,7 @@ describe("constellation commands", () => {
 		);
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -202,7 +202,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation model list new_project3");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------
@@ -227,7 +227,7 @@ describe("constellation commands", () => {
 		await runWrangler("constellation model delete new_project3 model2");
 		expect(std.out).toMatchInlineSnapshot(`
 		"--------------------
-		🚧 Constellation AI is currently in open alpha and is not recommended for production data and traffic
+		🚧 Constellation is currently in open alpha and is not recommended for production data and traffic
 		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------

package/src/__tests__/index.test.ts

@@ -49,7 +49,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
-			  wrangler constellation               🤖 Interact with Constellation AI models
+			  wrangler constellation               🤖 Interact with Constellation models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
@@ -103,7 +103,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
-			  wrangler constellation               🤖 Interact with Constellation AI models
+			  wrangler constellation               🤖 Interact with Constellation models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/init.test.ts

@@ -4,6 +4,7 @@ import * as TOML from "@iarna/toml";
 import { execa, execaSync } from "execa";
 import { rest } from "msw";
 import { parseConfigFileTextToJson } from "typescript";
+import { FormData } from "undici";
 import { version as wranglerVersion } from "../../package.json";
 import { getPackageManager } from "../package-manager";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
@@ -2235,6 +2236,12 @@ describe("init", () => {
 			},
 		};
 		`;
+		afterEach(() => {
+			// some test has a side-effect which is overwriting the compatibility_date
+			mockServiceMetadata.default_environment.script.compatibility_date =
+				"1987-9-27";
+			mockConfigExpected.compatibility_date = "1987-9-27";
+		});
 		const mockServiceMetadata = {
 			id: "memory-crystal",
 			default_environment: {
@@ -3001,7 +3008,7 @@ describe("init", () => {
 								success: true,
 								errors: [],
 								messages: [],
-								result: mockServiceMetadata.default_environment,
+								result: mockData.default_environment,
 							})
 						);
 					}
@@ -3074,6 +3081,72 @@ describe("init", () => {
 				},
 			});
 		});
+
+		it("should download multi-module source scripts from dashboard", async () => {
+			mockSupportingDashRequests({
+				expectedAccountId: "LCARS",
+				expectedScriptName: "isolinear-optical-chip",
+				expectedEnvironment: "test",
+				expectedCompatDate: "1987-9-27",
+			});
+			const indexjs = `
+        import handleRequest from './handleRequest.js';
+
+        export default {
+          async fetch(request, env, ctx) {
+            return handleRequest(request, env, ctx);
+          },
+        };
+      `;
+			const otherjs = `
+        export default function (request, env, ctx) {
+          return new Response("Hello World!");
+        }
+      `;
+			setMockFetchDashScript([
+				{ name: "index.js", contents: indexjs },
+				{ name: "nested/other.js", contents: otherjs },
+			]);
+			mockConfirm(
+				{
+					text: "Would you like to use git to manage this Worker?",
+					result: false,
+				},
+				{
+					text: "No package.json found. Would you like to create one?",
+					result: true,
+				},
+				{
+					text: "Would you like to use TypeScript?",
+					result: false,
+				}
+			);
+
+			await runWrangler("init --from-dash isolinear-optical-chip");
+
+			checkFiles({
+				items: {
+					"isolinear-optical-chip/src/index.js": {
+						contents: indexjs,
+					},
+					"isolinear-optical-chip/src/nested/other.js": {
+						contents: otherjs,
+					},
+					"isolinear-optical-chip/src/index.ts": false,
+					"isolinear-optical-chip/package.json": {
+						contents: expect.objectContaining({
+							name: "isolinear-optical-chip",
+						}),
+					},
+					"isolinear-optical-chip/tsconfig.json": false,
+					"isolinear-optical-chip/wrangler.toml": wranglerToml({
+						...mockConfigExpected,
+						name: "isolinear-optical-chip",
+						main: "src/index.js",
+					}),
+				},
+			});
+		});
 	});
 });
 
@@ -3095,12 +3168,38 @@ function getDefaultBranchName() {
 /**
  * Mock setter for usage within test blocks for dashboard script
  */
-export function setMockFetchDashScript(mockResponse: string) {
+export function setMockFetchDashScript(
+	mockResponse: string | { name: string; contents: string }[]
+) {
 	msw.use(
 		rest.get(
 			`*/accounts/:accountId/workers/services/:fromDashScriptName/environments/:environment/content`,
 			(_, res, ctx) => {
-				return res(ctx.text(mockResponse));
+				if (typeof mockResponse === "string") {
+					return res(ctx.text(mockResponse));
+				}
+
+				const fd = new FormData();
+
+				for (const { name, contents } of mockResponse) {
+					fd.set(name, contents);
+				}
+
+				const boundary = "--------boundary-12761293712";
+				const responseText =
+					`--${boundary}\r\n` +
+					mockResponse
+						.map(
+							({ name, contents }) =>
+								`Content-Disposition: form-data; name="${name}"\r\n\r\n${contents}`
+						)
+						.join(`\r\n--${boundary}\r\n`) +
+					`\r\n--${boundary}--`;
+
+				return res(
+					ctx.set("Content-Type", `multipart/form-data; boundary=${boundary}`),
+					ctx.body(responseText)
+				);
 			}
 		)
 	);

package/src/__tests__/mtls-certificates.test.ts

@@ -379,7 +379,7 @@ describe("wrangler", () => {
 				  wrangler r2                          📦 Interact with an R2 store
 				  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 				  wrangler d1                          🗄  Interact with a D1 database
-				  wrangler constellation               🤖 Interact with Constellation AI models
+				  wrangler constellation               🤖 Interact with Constellation models
 				  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 				  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 				  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/pages/functions-build.test.ts

@@ -503,6 +503,7 @@ export const cat = "cat";`
 		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
 		Content-Type: application/javascript+module
 
+		// _worker.js/index.js
 		import { cat } from \\"./cat.js\\";
 		var worker_default = {
 		  async fetch(request, env) {