wrangler 0.0.0-e87ad068 → 0.0.0-e89ee2a5

package/src/d1/execute.tsx

@@ -1,371 +0,0 @@
-import { existsSync } from "node:fs";
-import { mkdir } from "node:fs/promises";
-import path from "node:path";
-import chalk from "chalk";
-import { Static, Text } from "ink";
-import Table from "ink-table";
-import { npxImport } from "npx-import";
-import React from "react";
-import { fetchResult } from "../cfetch";
-import { readConfig } from "../config";
-import { getLocalPersistencePath } from "../dev/get-local-persistence-path";
-import { confirm } from "../dialogs";
-import { logger } from "../logger";
-import { readFileSync } from "../parse";
-import { readableRelative } from "../paths";
-import { requireAuth } from "../user";
-import { renderToString } from "../utils/render";
-import { DEFAULT_BATCH_SIZE } from "./constants";
-import * as options from "./options";
-import splitSqlQuery from "./splitter";
-import {
-	d1BetaWarning,
-	getDatabaseByNameOrBinding,
-	getDatabaseInfoFromConfig,
-} from "./utils";
-import type { Config, ConfigFields, DevConfig, Environment } from "../config";
-import type {
-	CommonYargsArgv,
-	StrictYargsOptionsToInterface,
-} from "../yargs-types";
-import type { Database } from "./types";
-
-export type QueryResult = {
-	results: Record<string, string | number | boolean>[];
-	success: boolean;
-	meta?: {
-		duration?: number;
-	};
-	query?: string;
-};
-
-export function Options(yargs: CommonYargsArgv) {
-	return options
-		.Database(yargs)
-		.option("yes", {
-			describe: 'Answer "yes" to any prompts',
-			type: "boolean",
-			alias: "y",
-		})
-		.option("local", {
-			describe:
-				"Execute commands/files against a local DB for use with wrangler dev",
-			type: "boolean",
-		})
-		.option("file", {
-			describe: "A .sql file to ingest",
-			type: "string",
-		})
-		.option("command", {
-			describe: "A single SQL statement to execute",
-			type: "string",
-		})
-		.option("persist-to", {
-			describe: "Specify directory to use for local persistence (for --local)",
-			type: "string",
-			requiresArg: true,
-		})
-		.option("json", {
-			describe: "Return output as clean JSON",
-			type: "boolean",
-			default: false,
-		})
-		.option("preview", {
-			describe: "Execute commands/files against a preview D1 DB",
-			type: "boolean",
-			default: false,
-		})
-		.option("batch-size", {
-			describe: "Number of queries to send in a single batch",
-			type: "number",
-			default: DEFAULT_BATCH_SIZE,
-		});
-}
-
-type HandlerOptions = StrictYargsOptionsToInterface<typeof Options>;
-
-export const Handler = async (args: HandlerOptions): Promise<void> => {
-	const {
-		local,
-		database,
-		yes,
-		persistTo,
-		file,
-		command,
-		json,
-		preview,
-		batchSize,
-	} = args;
-	const existingLogLevel = logger.loggerLevel;
-	if (json) {
-		// set loggerLevel to error to avoid readConfig warnings appearing in JSON output
-		logger.loggerLevel = "error";
-	}
-	const config = readConfig(args.config, args);
-	logger.log(d1BetaWarning);
-	if (file && command)
-		return logger.error(`Error: can't provide both --command and --file.`);
-
-	const isInteractive = process.stdout.isTTY;
-	const response: QueryResult[] | null = await executeSql({
-		local,
-		config,
-		name: database,
-		shouldPrompt: isInteractive && !yes,
-		persistTo,
-		file,
-		command,
-		json,
-		preview,
-		batchSize,
-	});
-
-	// Early exit if prompt rejected
-	if (!response) return;
-
-	if (isInteractive && !json) {
-		// Render table if single result
-		logger.log(
-			renderToString(
-				<Static items={response}>
-					{(result) => {
-						// batch results
-						if (!Array.isArray(result)) {
-							const { results, query } = result;
-
-							if (Array.isArray(results) && results.length > 0) {
-								const shortQuery = shorten(query, 48);
-								return (
-									<>
-										{shortQuery ? <Text dimColor>{shortQuery}</Text> : null}
-										<Table data={results}></Table>
-									</>
-								);
-							}
-						}
-					}}
-				</Static>
-			)
-		);
-	} else {
-		// set loggerLevel back to what it was before to actually output the JSON in stdout
-		logger.loggerLevel = existingLogLevel;
-		logger.log(JSON.stringify(response, null, 2));
-	}
-};
-
-export async function executeSql({
-	local,
-	config,
-	name,
-	shouldPrompt,
-	persistTo,
-	file,
-	command,
-	json,
-	preview,
-	batchSize,
-}: {
-	local: boolean | undefined;
-	config: ConfigFields<DevConfig> & Environment;
-	name: string;
-	shouldPrompt: boolean | undefined;
-	persistTo: string | undefined;
-	file: string | undefined;
-	command: string | undefined;
-	json: boolean | undefined;
-	preview: boolean | undefined;
-	batchSize: number;
-}) {
-	const sql = file ? readFileSync(file) : command;
-	if (!sql) throw new Error(`Error: must provide --command or --file.`);
-	if (preview && local)
-		throw new Error(`Error: can't use --preview with --local`);
-	if (persistTo && !local)
-		throw new Error(`Error: can't use --persist-to without --local`);
-	logger.log(`🌀 Mapping SQL input into an array of statements`);
-	const queries = splitSqlQuery(sql);
-
-	if (file && sql) {
-		if (queries[0].startsWith("SQLite format 3")) {
-			//TODO: update this error to recommend using `wrangler d1 restore` when it exists
-			throw new Error(
-				"Provided file is a binary SQLite database file instead of an SQL text file.\nThe execute command can only process SQL text files.\nPlease export an SQL file from your SQLite database and try again."
-			);
-		}
-	}
-
-	return local
-		? await executeLocally({
-				config,
-				name,
-				shouldPrompt,
-				queries,
-				persistTo,
-				json,
-		  })
-		: await executeRemotely({
-				config,
-				name,
-				shouldPrompt,
-				batches: batchSplit(queries, batchSize),
-				json,
-				preview,
-		  });
-}
-
-async function executeLocally({
-	config,
-	name,
-	shouldPrompt,
-	queries,
-	persistTo,
-	json,
-}: {
-	config: Config;
-	name: string;
-	shouldPrompt: boolean | undefined;
-	queries: string[];
-	persistTo: string | undefined;
-	json: boolean | undefined;
-}) {
-	const localDB = getDatabaseInfoFromConfig(config, name);
-	if (!localDB) {
-		throw new Error(
-			`Can't find a DB with name/binding '${name}' in local config. Check info in wrangler.toml...`
-		);
-	}
-
-	const persistencePath = getLocalPersistencePath(
-		persistTo,
-		true,
-		config.configPath
-	);
-
-	const dbDir = path.join(persistencePath, "d1");
-	const dbPath = path.join(dbDir, `${localDB.binding}.sqlite3`);
-	const [{ D1Database, D1DatabaseAPI }, { createSQLiteDB }] = await npxImport<
-		// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-		[typeof import("@miniflare/d1"), typeof import("@miniflare/shared")]
-	>(["@miniflare/d1", "@miniflare/shared"], logger.log);
-
-	if (!existsSync(dbDir)) {
-		const ok =
-			json ||
-			!shouldPrompt ||
-			(await confirm(`About to create ${readableRelative(dbPath)}, ok?`));
-		if (!ok) return null;
-		await mkdir(dbDir, { recursive: true });
-	}
-
-	logger.log(`🌀 Loading DB at ${readableRelative(dbPath)}`);
-
-	const sqliteDb = await createSQLiteDB(dbPath);
-	const db = new D1Database(new D1DatabaseAPI(sqliteDb));
-	const stmts = queries.map((query) => db.prepare(query));
-	return (await db.batch(stmts)) as QueryResult[];
-}
-
-async function executeRemotely({
-	config,
-	name,
-	shouldPrompt,
-	batches,
-	json,
-	preview,
-}: {
-	config: Config;
-	name: string;
-	shouldPrompt: boolean | undefined;
-	batches: string[];
-	json: boolean | undefined;
-	preview: boolean | undefined;
-}) {
-	const multiple_batches = batches.length > 1;
-	// in JSON mode, we don't want a prompt here
-	if (multiple_batches && !json) {
-		const warning = `⚠️  Too much SQL to send at once, this execution will be sent as ${batches.length} batches.`;
-
-		if (shouldPrompt) {
-			const ok = await confirm(
-				`${warning}\nℹ️  Each batch is sent individually and may leave your DB in an unexpected state if a later batch fails.\n⚠️  Make sure you have a recent backup. Ok to proceed?`
-			);
-			if (!ok) return null;
-			logger.log(`🌀 Let's go`);
-		} else {
-			logger.error(warning);
-		}
-	}
-
-	const accountId = await requireAuth(config);
-	const db: Database = await getDatabaseByNameOrBinding(
-		config,
-		accountId,
-		name
-	);
-	if (preview && !db.previewDatabaseUuid) {
-		throw logger.error(
-			"Please define a `preview_database_id` in your wrangler.toml to execute your queries against a preview database"
-		);
-	}
-	const dbUuid = preview ? db.previewDatabaseUuid : db.uuid;
-	logger.log(`🌀 Executing on ${name} (${dbUuid}):`);
-
-	const results: QueryResult[] = [];
-	for (const sql of batches) {
-		if (multiple_batches)
-			logger.log(
-				chalk.gray(`  ${sql.slice(0, 70)}${sql.length > 70 ? "..." : ""}`)
-			);
-
-		const result = await fetchResult<QueryResult[]>(
-			`/accounts/${accountId}/d1/database/${dbUuid}/query`,
-			{
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					...(db.internal_env ? { "x-d1-internal-env": db.internal_env } : {}),
-				},
-				body: JSON.stringify({ sql }),
-			}
-		);
-		logResult(result);
-		results.push(...result);
-	}
-	return results;
-}
-
-function logResult(r: QueryResult | QueryResult[]) {
-	logger.log(
-		`🚣 Executed ${
-			Array.isArray(r) ? `${r.length} commands` : "1 command"
-		} in ${
-			Array.isArray(r)
-				? r
-						.map((d: QueryResult) => d.meta?.duration || 0)
-						.reduce((a: number, b: number) => a + b, 0)
-				: r.meta?.duration
-		}ms`
-	);
-}
-
-function batchSplit(queries: string[], batchSize: number) {
-	logger.log(`🌀 Parsing ${queries.length} statements`);
-	const num_batches = Math.ceil(queries.length / batchSize);
-	const batches: string[] = [];
-	for (let i = 0; i < num_batches; i++) {
-		batches.push(queries.slice(i * batchSize, (i + 1) * batchSize).join("; "));
-	}
-	if (num_batches > 1) {
-		logger.log(
-			`🌀 We are sending ${num_batches} batch(es) to D1 (limited to ${batchSize} statements per batch. Use --batch-size to override.)`
-		);
-	}
-	return batches;
-}
-
-function shorten(query: string | undefined, length: number) {
-	return query && query.length > length
-		? query.slice(0, length) + "..."
-		: query;
-}

package/src/d1/formatTimeAgo.ts

@@ -1,14 +0,0 @@
-import TimeAgo from "javascript-time-ago";
-import en from "javascript-time-ago/locale/en";
-import prettyBytes from "pretty-bytes";
-TimeAgo.addDefaultLocale(en);
-const timeAgo = new TimeAgo("en-US");
-
-export const formatTimeAgo = (date: Date): string => {
-	const result = timeAgo.format(date);
-	return Array.isArray(result) ? result[0] : result;
-};
-
-export const formatBytes = (bytes: number): string => {
-	return prettyBytes(bytes);
-};

package/src/d1/index.ts

@@ -1,100 +0,0 @@
-import * as Backups from "./backups";
-import * as Create from "./create";
-import * as Delete from "./delete";
-import * as Execute from "./execute";
-import * as List from "./list";
-import * as Migrations from "./migrations";
-import { d1BetaWarning } from "./utils";
-import type { CommonYargsArgv } from "../yargs-types";
-
-export function d1(yargs: CommonYargsArgv) {
-	return (
-		yargs
-			.command("list", "List D1 databases", List.Options, List.Handler)
-			.command(
-				"create <name>",
-				"Create D1 database",
-				Create.Options,
-				Create.Handler
-			)
-			.command(
-				"delete <name>",
-				"Delete D1 database",
-				Delete.Options,
-				Delete.Handler
-			)
-			.command("backup", "Interact with D1 Backups", (backupArgs) =>
-				backupArgs
-					.demandCommand()
-					.command(
-						"list <name>",
-						"List your D1 backups",
-						Backups.ListOptions,
-						Backups.ListHandler
-					)
-					.command(
-						"create <name>",
-						"Create a new D1 backup",
-						Backups.CreateOptions,
-						Backups.CreateHandler
-					)
-					.command(
-						"restore <name> <backup-id>",
-						"Restore a DB backup",
-						Backups.RestoreOptions,
-						Backups.RestoreHandler
-					)
-					.command(
-						"download <name> <backup-id>",
-						"Download a DB backup",
-						Backups.DownloadOptions,
-						Backups.DownloadHandler
-					)
-					.epilogue(d1BetaWarning)
-			)
-			// .command(
-			//   "console <name>",
-			//   "Open a Console on a D1 database",
-			//   (d1CreateYargs) => {
-			//     return d1CreateYargs.positional("name", {
-			//       describe: "The name of the DB",
-			//       type: "string",
-			//       demandOption: true,
-			//     });
-			//   },
-			//   async (_) => {
-			//     // TODO
-			//   }
-			// )
-			.command(
-				"execute <database>",
-				"Executed command or SQL file",
-				Execute.Options,
-				Execute.Handler
-			)
-			.command("migrations", "Interact with D1 Migrations", (yargs2) =>
-				yargs2
-					.demandCommand()
-					.command(
-						"list <database>",
-						"List your D1 migrations",
-						Migrations.ListOptions,
-						Migrations.ListHandler
-					)
-					.command(
-						"create <database> <message>",
-						"Create a new Migration",
-						Migrations.CreateOptions,
-						Migrations.CreateHandler
-					)
-					.command(
-						"apply <database>",
-						"Apply D1 Migrations",
-						Migrations.ApplyOptions,
-						Migrations.ApplyHandler
-					)
-					.epilogue(d1BetaWarning)
-			)
-			.epilogue(d1BetaWarning)
-	);
-}

package/src/d1/list.tsx

@@ -1,62 +0,0 @@
-import Table from "ink-table";
-import React from "react";
-import { fetchResult } from "../cfetch";
-import { withConfig } from "../config";
-import { logger } from "../logger";
-import { requireAuth } from "../user";
-import { renderToString } from "../utils/render";
-import { d1BetaWarning } from "./utils";
-import type {
-	CommonYargsArgv,
-	StrictYargsOptionsToInterface,
-} from "../yargs-types";
-import type { Database } from "./types";
-
-export function Options(d1ListYargs: CommonYargsArgv) {
-	return d1ListYargs
-		.option("json", {
-			describe: "return output as clean JSON",
-			type: "boolean",
-			default: false,
-		})
-		.epilogue(d1BetaWarning);
-}
-
-type HandlerOptions = StrictYargsOptionsToInterface<typeof Options>;
-export const Handler = withConfig<HandlerOptions>(
-	async ({ json, config }): Promise<void> => {
-		const accountId = await requireAuth(config);
-		const dbs: Array<Database> = await listDatabases(accountId);
-
-		if (json) {
-			logger.log(JSON.stringify(dbs, null, 2));
-		} else {
-			logger.log(d1BetaWarning);
-			logger.log(renderToString(<Table data={dbs}></Table>));
-		}
-	}
-);
-
-export const listDatabases = async (
-	accountId: string
-): Promise<Array<Database>> => {
-	const pageSize = 10;
-	let page = 1;
-	const results = [];
-	while (results.length % pageSize === 0) {
-		const json: Array<Database> = await fetchResult(
-			`/accounts/${accountId}/d1/database`,
-			{},
-			new URLSearchParams({
-				per_page: pageSize.toString(),
-				page: page.toString(),
-			})
-		);
-		page++;
-		results.push(...json);
-		if (json.length < pageSize) {
-			break;
-		}
-	}
-	return results;
-};