wrangler 0.0.0-e6c9c5c0 → 0.0.0-e6e1daba

package/src/d1/migrations/helpers.ts

@@ -10,11 +10,15 @@ import type { ConfigFields, DevConfig, Environment } from "../../config";
 import type { QueryResult } from "../execute";
 import type { Migration } from "../types";
 
-export async function getMigrationsPath(
-	projectPath: string,
-	migrationsFolderPath: string,
-	createIfMissing: boolean
-): Promise<string> {
+export async function getMigrationsPath({
+	projectPath,
+	migrationsFolderPath,
+	createIfMissing,
+}: {
+	projectPath: string;
+	migrationsFolderPath: string;
+	createIfMissing: boolean;
+}): Promise<string> {
 	const dir = path.resolve(projectPath, migrationsFolderPath);
 	if (fs.existsSync(dir)) return dir;
 
@@ -34,21 +38,31 @@ export async function getMigrationsPath(
 	throw new Error(`No migrations present at ${dir}.`);
 }
 
-export async function getUnappliedMigrations(
-	migrationsTableName: string,
-	migrationsPath: string,
-	local: undefined | boolean,
-	config: ConfigFields<DevConfig> & Environment,
-	name: string,
-	persistTo: undefined | string
-): Promise<Array<string>> {
+export async function getUnappliedMigrations({
+	migrationsTableName,
+	migrationsPath,
+	local,
+	config,
+	name,
+	persistTo,
+	preview,
+}: {
+	migrationsTableName: string;
+	migrationsPath: string;
+	local: boolean | undefined;
+	config: ConfigFields<DevConfig> & Environment;
+	name: string;
+	persistTo: string | undefined;
+	preview: boolean | undefined;
+}): Promise<Array<string>> {
 	const appliedMigrations = (
 		await listAppliedMigrations(
 			migrationsTableName,
 			local,
 			config,
 			name,
-			persistTo
+			persistTo,
+			preview
 		)
 	).map((migration) => {
 		return migration.name;
@@ -68,24 +82,25 @@ export async function getUnappliedMigrations(
 
 const listAppliedMigrations = async (
 	migrationsTableName: string,
-	local: undefined | boolean,
+	local: boolean | undefined,
 	config: ConfigFields<DevConfig> & Environment,
 	name: string,
-	persistTo: undefined | string
+	persistTo: string | undefined,
+	preview: boolean | undefined
 ): Promise<Migration[]> => {
-	const Query = `SELECT *
-									 FROM ${migrationsTableName}
-									 ORDER BY id`;
-
-	const response: QueryResult[] | null = await executeSql(
+	const response: QueryResult[] | null = await executeSql({
 		local,
 		config,
 		name,
-		isInteractive() && !CI.isCI(),
+		shouldPrompt: isInteractive() && !CI.isCI(),
 		persistTo,
-		undefined,
-		Query
-	);
+		command: `SELECT *
+		FROM ${migrationsTableName}
+		ORDER BY id`,
+		file: undefined,
+		json: undefined,
+		preview,
+	});
 
 	if (!response || response[0].results.length === 0) return [];
 
@@ -121,27 +136,37 @@ export function getNextMigrationNumber(migrationsPath: string): number {
 	return highestMigrationNumber + 1;
 }
 
-export const initMigrationsTable = async (
-	migrationsTableName: string,
-	local: undefined | boolean,
-	config: ConfigFields<DevConfig> & Environment,
-	name: string,
-	persistTo: undefined | string
-) => {
-	return executeSql(
+export const initMigrationsTable = async ({
+	migrationsTableName,
+	local,
+	config,
+	name,
+	persistTo,
+	preview,
+}: {
+	migrationsTableName: string;
+	local: boolean | undefined;
+	config: ConfigFields<DevConfig> & Environment;
+	name: string;
+	persistTo: string | undefined;
+	preview: boolean | undefined;
+}) => {
+	return executeSql({
 		local,
 		config,
 		name,
-		isInteractive() && !CI.isCI(),
+		shouldPrompt: isInteractive() && !CI.isCI(),
 		persistTo,
-		undefined,
-		`
+		command: `
 						CREATE TABLE IF NOT EXISTS ${migrationsTableName}
 						(
 								id         INTEGER PRIMARY KEY AUTOINCREMENT,
 								name       TEXT UNIQUE,
 								applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
 						);
-				`
-	);
+				`,
+		file: undefined,
+		json: undefined,
+		preview,
+	});
 };

package/src/d1/migrations/list.tsx

@@ -5,27 +5,34 @@ import React from "react";
 import { withConfig } from "../../config";
 import { logger } from "../../logger";
 import { requireAuth } from "../../user";
+import { DEFAULT_MIGRATION_PATH, DEFAULT_MIGRATION_TABLE } from "../constants";
 import { d1BetaWarning, getDatabaseInfoFromConfig } from "../utils";
 import {
 	getMigrationsPath,
 	getUnappliedMigrations,
 	initMigrationsTable,
 } from "./helpers";
-import { DatabaseWithLocal } from "./options";
-import type { BaseSqlExecuteArgs } from "../execute";
-import type { Argv } from "yargs";
+import { MigrationOptions } from "./options";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../yargs-types";
 
-export function ListOptions(yargs: Argv): Argv<BaseSqlExecuteArgs> {
-	return DatabaseWithLocal(yargs);
+export function ListOptions(yargs: CommonYargsArgv) {
+	return MigrationOptions(yargs);
 }
 
-export const ListHandler = withConfig<BaseSqlExecuteArgs>(
-	async ({ config, database, local, persistTo }): Promise<void> => {
-		await requireAuth({});
+type ListHandlerOptions = StrictYargsOptionsToInterface<typeof ListOptions>;
+
+export const ListHandler = withConfig<ListHandlerOptions>(
+	async ({ config, database, local, persistTo, preview }): Promise<void> => {
+		if (!local) {
+			await requireAuth({});
+		}
 		logger.log(d1BetaWarning);
 
-		const databaseInfo = await getDatabaseInfoFromConfig(config, database);
-		if (!databaseInfo) {
+		const databaseInfo = getDatabaseInfoFromConfig(config, database);
+		if (!databaseInfo && !local) {
 			throw new Error(
 				`Can't find a DB with name/binding '${database}' in local config. Check info in wrangler.toml...`
 			);
@@ -34,30 +41,36 @@ export const ListHandler = withConfig<BaseSqlExecuteArgs>(
 		if (!config.configPath) {
 			return;
 		}
-		const { migrationsTableName, migrationsFolderPath } = databaseInfo;
 
-		const migrationsPath = await getMigrationsPath(
-			path.dirname(config.configPath),
-			migrationsFolderPath,
-			false
-		);
-		await initMigrationsTable(
+		const migrationsPath = await getMigrationsPath({
+			projectPath: path.dirname(config.configPath),
+			migrationsFolderPath:
+				databaseInfo?.migrationsFolderPath ?? DEFAULT_MIGRATION_PATH,
+			createIfMissing: false,
+		});
+
+		const migrationsTableName =
+			databaseInfo?.migrationsTableName ?? DEFAULT_MIGRATION_TABLE;
+
+		await initMigrationsTable({
 			migrationsTableName,
 			local,
 			config,
-			database,
-			persistTo
-		);
+			name: database,
+			persistTo,
+			preview,
+		});
 
 		const unappliedMigrations = (
-			await getUnappliedMigrations(
+			await getUnappliedMigrations({
 				migrationsTableName,
 				migrationsPath,
 				local,
 				config,
-				database,
-				persistTo
-			)
+				name: database,
+				persistTo,
+				preview,
+			})
 		).map((migration) => {
 			return {
 				Name: migration,

package/src/d1/migrations/options.ts

@@ -1,13 +1,18 @@
 import { Database } from "../options";
-import type { Argv } from "yargs";
+import type { CommonYargsArgv } from "../../yargs-types";
 
-export function DatabaseWithLocal(yargs: Argv) {
+export function MigrationOptions(yargs: CommonYargsArgv) {
 	return Database(yargs)
 		.option("local", {
 			describe:
 				"Execute commands/files against a local DB for use with wrangler dev --local",
 			type: "boolean",
 		})
+		.option("preview", {
+			describe: "Execute commands/files against a preview D1 DB",
+			type: "boolean",
+			default: false,
+		})
 		.option("persist-to", {
 			describe:
 				"Specify directory to use for local persistence (you must use --local with this flag)",

package/src/d1/options.ts

@@ -1,7 +1,7 @@
 import { d1BetaWarning } from "./utils";
-import type { Argv } from "yargs";
+import type { CommonYargsArgv } from "../yargs-types";
 
-export function Name(yargs: Argv) {
+export function Name(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("name", {
 			describe: "The name or binding of the DB",
@@ -11,7 +11,7 @@ export function Name(yargs: Argv) {
 		.epilogue(d1BetaWarning);
 }
 
-export function Database(yargs: Argv) {
+export function Database(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("database", {
 			describe: "The name or binding of the DB",

package/src/d1/types.ts

@@ -1,5 +1,6 @@
 export type Database = {
 	uuid: string;
+	previewDatabaseUuid?: string;
 	name: string;
 	binding: string;
 	internal_env?: string;

package/src/d1/utils.ts

@@ -14,6 +14,7 @@ export function getDatabaseInfoFromConfig(
 		) {
 			return {
 				uuid: d1Database.database_id,
+				previewDatabaseUuid: d1Database.preview_database_id,
 				binding: d1Database.binding,
 				name: d1Database.database_name,
 				migrationsTableName:
@@ -45,4 +46,4 @@ export const getDatabaseByNameOrBinding = async (
 
 export const d1BetaWarning = process.env.NO_D1_WARNING
 	? ""
-	: "--------------------\n🚧 D1 is currently in open alpha and is not recommended for production data and traffic\n🚧 Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose\n🚧 To request features, visit https://community.cloudflare.com/c/developers/d1\n🚧 To give feedback, visit https://discord.gg/cloudflaredev\n--------------------\n";
+	: "--------------------\n🚧 D1 is currently in open alpha and is not recommended for production data and traffic\n🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose\n🚧 To request features, visit https://community.cloudflare.com/c/developers/d1\n🚧 To give feedback, visit https://discord.gg/cloudflaredev\n--------------------\n";

package/src/delete.ts

@@ -8,14 +8,12 @@ import { logger } from "./logger";
 import * as metrics from "./metrics";
 import { requireAuth } from "./user";
 import { getScriptName, printWranglerBanner } from "./index";
-import type { ConfigPath } from "./index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "./yargs-types";
-import type { Argv } from "yargs";
 
-export function deleteOptions(yargs: Argv<CommonYargsOptions>) {
+export function deleteOptions(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("script", {
 			describe: "The path to an entry point for your worker",
@@ -38,14 +36,13 @@ export function deleteOptions(yargs: Argv<CommonYargsOptions>) {
 		});
 }
 
-type DeleteArgs = YargsOptionsToInterface<typeof deleteOptions>;
+type DeleteArgs = StrictYargsOptionsToInterface<typeof deleteOptions>;
 
 export async function deleteHandler(args: DeleteArgs) {
 	await printWranglerBanner();
 
 	const configPath =
-		(args.config as ConfigPath) ||
-		(args.script && findWranglerToml(path.dirname(args.script)));
+		args.config || (args.script && findWranglerToml(path.dirname(args.script)));
 	const config = readConfig(configPath, args);
 	await metrics.sendMetricsEvent(
 		"delete worker script",

package/src/deployments.ts

@@ -5,33 +5,29 @@ import * as metrics from "./metrics";
 import type { Config } from "./config";
 import type { ServiceMetadataRes } from "./init";
 
-export type DeploymentListRes = {
-	latest: {
-		id: string;
-		number: string;
-		metadata: {
-			author_id: string;
-			author_email: string;
-			source: "api" | "dash" | "wrangler" | "terraform" | "other";
-			created_on: string;
-			modified_on: string;
-		};
-		resources: {
-			script: string;
-			bindings: unknown[];
-		};
+type DeploymentDetails = {
+	id: string;
+	number: string;
+	annotations: {
+		"workers/triggered_by": string;
+		"workers/rollback_from": string;
 	};
-	items: {
-		id: string;
-		number: string;
-		metadata: {
-			author_id: string;
-			author_email: string;
-			source: "api" | "dash" | "wrangler" | "terraform" | "other";
-			created_on: string;
-			modified_on: string;
-		};
-	}[];
+	metadata: {
+		author_id: string;
+		author_email: string;
+		source: "api" | "dash" | "wrangler" | "terraform" | "other";
+		created_on: string;
+		modified_on: string;
+	};
+	resources: {
+		script: string;
+		bindings: unknown[];
+	};
+};
+
+export type DeploymentListResult = {
+	latest: DeploymentDetails;
+	items: DeploymentDetails[];
 };
 
 export async function deployments(
@@ -59,35 +55,62 @@ export async function deployments(
 
 	const scriptTag = scriptMetadata.default_environment.script.tag;
 	const params = new URLSearchParams({ order: "asc" });
-	const { items: deploys } = await fetchResult<DeploymentListRes>(
+	const { items: deploys } = await fetchResult<DeploymentListResult>(
 		`/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`,
 		undefined,
 		params
 	);
 
-	const versionMessages = deploys.map(
-		(versions) =>
-			`\nDeployment ID: ${versions.id}
-Created on: ${versions.metadata.created_on}
-Author: ${versions.metadata.author_email}
-Source: ${sourceStr(versions.metadata.source)}\n`
-	);
+	const versionMessages = deploys.map((versions) => {
+		const triggerStr = versions.annotations?.["workers/triggered_by"]
+			? `${formatTrigger(
+					versions.annotations["workers/triggered_by"]
+			  )} from ${formatSource(versions.metadata.source)}`
+			: `${formatSource(versions.metadata.source)}`;
+
+		let version = `
+Deployment ID: ${versions.id}
+Created on:    ${versions.metadata.created_on}
+Author:        ${versions.metadata.author_email}
+Trigger:       ${triggerStr}`;
+
+		if (versions.annotations?.["workers/rollback_from"]) {
+			version += `\nRollback from: ${versions.annotations["workers/rollback_from"]}`;
+		}
+
+		return version + `\n`;
+	});
 
 	versionMessages[versionMessages.length - 1] += "🟩 Active";
 	logger.log(...versionMessages);
 }
 
-function sourceStr(source: string): string {
+function formatSource(source: string): string {
 	switch (source) {
 		case "api":
-			return "📡 API";
+			return "API 📡";
 		case "dash":
-			return "🖥️ Dashboard";
+			return "Dashboard 🖥️";
 		case "wrangler":
-			return "🤠 Wrangler";
+			return "Wrangler 🤠";
 		case "terraform":
-			return "🏗️ Terraform";
+			return "Terraform 🏗️";
 		default:
 			return "Other";
 	}
 }
+
+function formatTrigger(trigger: string): string {
+	switch (trigger) {
+		case "upload":
+			return "Upload";
+		case "secret":
+			return "Secret Change";
+		case "rollback":
+			return "Rollback";
+		case "promotion":
+			return "Promotion";
+		default:
+			return "Unknown";
+	}
+}

package/src/deprecated/index.ts

@@ -3,15 +3,14 @@ import { createCLIParser } from "../index";
 import { logger } from "../logger";
 import { formatMessage } from "../parse";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
-import type { Argv, BuilderCallback } from "yargs";
 
-export function buildOptions(yargs: Argv<CommonYargsOptions>) {
+export function buildOptions(yargs: CommonYargsArgv) {
 	return yargs;
 }
-type BuildArgs = YargsOptionsToInterface<typeof buildOptions>;
+type BuildArgs = StrictYargsOptionsToInterface<typeof buildOptions>;
 export async function buildHandler(buildArgs: BuildArgs) {
 	// "[DEPRECATED] 🦀 Build your project (if applicable)",
 
@@ -47,7 +46,7 @@ export const configHandler = () => {
 	);
 };
 
-export function previewOptions(yargs: Argv<CommonYargsOptions>) {
+export function previewOptions(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("method", {
 			type: "string",
@@ -71,7 +70,7 @@ export function previewHandler() {
 	);
 }
 
-export const route: BuilderCallback<unknown, unknown> = (routeYargs: Argv) => {
+export const route = (routeYargs: CommonYargsArgv) => {
 	return routeYargs
 		.command(
 			"list",
@@ -134,7 +133,7 @@ export const routeHandler = () => {
 	throw new DeprecationError(`${deprecationNotice}\n${shouldDo}`);
 };
 
-export const subdomainOptions = (yargs: Argv<CommonYargsOptions>) => {
+export const subdomainOptions = (yargs: CommonYargsArgv) => {
 	return yargs.positional("name", { type: "string" });
 };
 

package/src/dev/dev.tsx

@@ -55,7 +55,7 @@ function useDevRegistry(
 
 		const interval =
 			// TODO: enable this for remote mode as well
-			// https://github.com/cloudflare/wrangler2/issues/1182
+			// https://github.com/cloudflare/workers-sdk/issues/1182
 			mode === "local"
 				? setInterval(() => {
 						getBoundRegisteredWorkers({
@@ -249,20 +249,6 @@ function DevSession(props: DevSessionProps) {
 		() => props.bindings.d1_databases?.map((db) => db.binding),
 		[props.bindings.d1_databases]
 	);
-	const everyD1BindingHasPreview = props.bindings.d1_databases?.every(
-		(binding) => binding.preview_database_id
-	);
-	if (
-		betaD1Shims &&
-		betaD1Shims.length > 0 &&
-		!(props.local || everyD1BindingHasPreview)
-	) {
-		handleError(
-			new Error(
-				"D1 bindings require dev --local or preview_database_id for now"
-			)
-		);
-	}
 
 	// If we are using d1 bindings, and are not bundling the worker
 	// we should error here as the d1 shim won't be added

package/src/dev/local.tsx

@@ -47,7 +47,6 @@ import type {
 } from "@miniflare/tre";
 import type { MiniflareOptions } from "miniflare";
 import type { ChildProcess } from "node:child_process";
-import type { RequestInit } from "undici";
 
 export interface LocalProps {
 	name: string | undefined;
@@ -817,14 +816,14 @@ export async function transformMf2OptionsToMf3Options({
 	// Build authenticated Cloudflare API fetch function if required
 	let cloudflareFetch: CloudflareFetch | undefined;
 	if (kvRemote && authenticatedAccountId !== undefined) {
+		const { Response: Miniflare3Response } = await getMiniflare3();
 		const preferredAccountId =
 			authenticatedAccountId === true ? undefined : authenticatedAccountId;
 		const accountId = await requireAuth({ account_id: preferredAccountId });
-		cloudflareFetch = (resource, searchParams, init) => {
+		cloudflareFetch = async (resource, searchParams, init) => {
 			resource = `/accounts/${accountId}/${resource}`;
-			// Miniflare and Wrangler's `undici` versions may be slightly different,
-			// but their `RequestInit` types *should* be compatible
-			return performApiFetch(resource, init as RequestInit, searchParams);
+			const response = await performApiFetch(resource, init, searchParams);
+			return new Miniflare3Response(response.body, response);
 		};
 	}
 
@@ -919,5 +918,5 @@ export async function getMiniflare3(): Promise<
 	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 	typeof import("@miniflare/tre")
 > {
-	return (miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.8"));
+	return (miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.10"));
 }

package/src/dev/remote.tsx

@@ -304,13 +304,13 @@ export function useWorker(
 			// TODO: Once we get service bindings working in the
 			// edge preview server, we can define remote dev service bindings
 			// and you can uncomment this code.
-			// https://github.com/cloudflare/wrangler2/issues/1182
+			// https://github.com/cloudflare/workers-sdk/issues/1182
 
 			/*
 			if (name) {
 				await registerWorker(name, {
 					mode: "remote",
-					// upstream protocol is always https (https://github.com/cloudflare/wrangler2/issues/583)
+					// upstream protocol is always https (https://github.com/cloudflare/workers-sdk/issues/583)
 					protocol: "https",
 					port: undefined,
 					host: workerPreviewToken.host,