wrangler 0.0.0-e33bea9b → 0.0.0-e351afcf

package/src/d1/create.tsx

@@ -1,8 +1,10 @@
-import { render, Text, Box } from "ink";
+import { Text, Box } from "ink";
 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,
@@ -20,45 +22,49 @@ export function Options(yargs: CommonYargsArgv) {
 		.epilogue(d1BetaWarning);
 }
 
-export async function Handler({
-	name,
-}: StrictYargsOptionsToInterface<typeof Options>): Promise<void> {
-	const accountId = await requireAuth({});
+type HandlerOptions = StrictYargsOptionsToInterface<typeof Options>;
+export const Handler = withConfig<HandlerOptions>(
+	async ({ name, config }): Promise<void> => {
+		const accountId = await requireAuth(config);
 
-	logger.log(d1BetaWarning);
+		logger.log(d1BetaWarning);
 
-	let db: Database;
-	try {
-		db = await fetchResult(`/accounts/${accountId}/d1/database`, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-			},
-			body: JSON.stringify({
-				name,
-			}),
-		});
-	} catch (e) {
-		if ((e as { code: number }).code === 7502) {
-			throw new Error("A database with that name already exists");
+		let db: Database;
+		try {
+			db = await fetchResult(`/accounts/${accountId}/d1/database`, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				body: JSON.stringify({
+					name,
+				}),
+			});
+		} catch (e) {
+			if ((e as { code: number }).code === 7502) {
+				throw new Error("A database with that name already exists");
+			}
+			throw e;
 		}
-		throw e;
-	}
 
-	render(
-		<Box flexDirection="column">
-			<Text>✅ Successfully created DB &apos;{db.name}&apos;!</Text>
-			<Text>&nbsp;</Text>
-			<Text>
-				Add the following to your wrangler.toml to connect to it from a Worker:
-			</Text>
-			<Text>&nbsp;</Text>
-			<Text>[[ d1_databases ]]</Text>
-			<Text>
-				binding = &quot;DB&quot; # i.e. available in your Worker on env.DB
-			</Text>
-			<Text>database_name = &quot;{db.name}&quot;</Text>
-			<Text>database_id = &quot;{db.uuid}&quot;</Text>
-		</Box>
-	);
-}
+		logger.log(
+			renderToString(
+				<Box flexDirection="column">
+					<Text>✅ Successfully created DB &apos;{db.name}&apos;!</Text>
+					<Text>&nbsp;</Text>
+					<Text>
+						Add the following to your wrangler.toml to connect to it from a
+						Worker:
+					</Text>
+					<Text>&nbsp;</Text>
+					<Text>[[ d1_databases ]]</Text>
+					<Text>
+						binding = &quot;DB&quot; # i.e. available in your Worker on env.DB
+					</Text>
+					<Text>database_name = &quot;{db.name}&quot;</Text>
+					<Text>database_id = &quot;{db.uuid}&quot;</Text>
+				</Box>
+			)
+		);
+	}
+);

package/src/d1/delete.ts

@@ -24,7 +24,7 @@ export function Options(d1ListYargs: CommonYargsArgv) {
 type HandlerOptions = StrictYargsOptionsToInterface<typeof Options>;
 export const Handler = withConfig<HandlerOptions>(
 	async ({ name, skipConfirmation, config }): Promise<void> => {
-		const accountId = await requireAuth({});
+		const accountId = await requireAuth(config);
 		logger.log(d1BetaWarning);
 
 		const db: Database = await getDatabaseByNameOrBinding(

package/src/d1/execute.tsx

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
 import chalk from "chalk";
-import { render, Static, Text } from "ink";
+import { Static, Text } from "ink";
 import Table from "ink-table";
 import { npxImport } from "npx-import";
 import React from "react";
@@ -14,6 +14,7 @@ import { logger } from "../logger";
 import { readFileSync } from "../parse";
 import { readableRelative } from "../paths";
 import { requireAuth } from "../user";
+import { renderToString } from "../utils/render";
 import * as options from "./options";
 import splitSqlQuery from "./splitter";
 import {
@@ -36,7 +37,7 @@ export type QueryResult = {
 	};
 	query?: string;
 };
-// Max number of bytes to send in a single /execute call
+// Max number of statements to send in a single /execute call
 const QUERY_LIMIT = 10_000;
 
 export function Options(yargs: CommonYargsArgv) {
@@ -110,25 +111,27 @@ export const Handler = async (args: HandlerOptions): Promise<void> => {
 
 	if (isInteractive && !json) {
 		// Render table if single result
-		render(
-			<Static items={response}>
-				{(result) => {
-					// batch results
-					if (!Array.isArray(result)) {
-						const { results, query } = 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>
-								</>
-							);
+							if (Array.isArray(results) && results.length > 0) {
+								const shortQuery = shorten(query, 48);
+								return (
+									<>
+										{shortQuery ? <Text dimColor>{shortQuery}</Text> : null}
+										<Table data={results}></Table>
+									</>
+								);
+							}
 						}
-					}
-				}}
-			</Static>
+					}}
+				</Static>
+			)
 		);
 	} else {
 		// set loggerLevel back to what it was before to actually output the JSON in stdout
@@ -278,7 +281,7 @@ async function executeRemotely({
 		}
 	}
 
-	const accountId = await requireAuth({});
+	const accountId = await requireAuth(config);
 	const db: Database = await getDatabaseByNameOrBinding(
 		config,
 		accountId,

package/src/d1/list.tsx

@@ -1,9 +1,10 @@
-import { render } from "ink";
 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,
@@ -21,19 +22,20 @@ export function Options(d1ListYargs: CommonYargsArgv) {
 		.epilogue(d1BetaWarning);
 }
 
-export async function Handler({
-	json,
-}: StrictYargsOptionsToInterface<typeof Options>): Promise<void> {
-	const accountId = await requireAuth({});
-	const dbs: Array<Database> = await listDatabases(accountId);
+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);
-		render(<Table data={dbs}></Table>);
+		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

package/src/d1/migrations/apply.tsx

@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import fs from "node:fs";
 import path from "path";
-import { Box, render, Text } from "ink";
+import { Box, Text } from "ink";
 import Table from "ink-table";
 import React from "react";
 import { withConfig } from "../../config";
@@ -10,6 +10,7 @@ import { CI } from "../../is-ci";
 import isInteractive from "../../is-interactive";
 import { logger } from "../../logger";
 import { requireAuth } from "../../user";
+import { renderToString } from "../../utils/render";
 import { createBackup } from "../backups";
 import { DEFAULT_MIGRATION_PATH, DEFAULT_MIGRATION_TABLE } from "../constants";
 import { executeSql } from "../execute";
@@ -97,14 +98,16 @@ export const ApplyHandler = withConfig<ApplyHandlerOptions>(
 			});
 
 		if (unappliedMigrations.length === 0) {
-			render(<Text>✅ No migrations to apply!</Text>);
+			logger.log(renderToString(<Text>✅ No migrations to apply!</Text>));
 			return;
 		}
-		render(
-			<Box flexDirection="column">
-				<Text>Migrations to be applied:</Text>
-				<Table data={unappliedMigrations} columns={["Name"]}></Table>
-			</Box>
+		logger.log(
+			renderToString(
+				<Box flexDirection="column">
+					<Text>Migrations to be applied:</Text>
+					<Table data={unappliedMigrations} columns={["Name"]}></Table>
+				</Box>
+			)
 		);
 		const ok = await confirm(
 			`About to apply ${unappliedMigrations.length} migration(s)
@@ -118,8 +121,8 @@ Your database may not be available to serve requests during the migration, conti
 				databaseInfo,
 				"In non-local mode `databaseInfo` should be defined."
 			);
-			render(<Text>🕒 Creating backup...</Text>);
-			const accountId = await requireAuth({});
+			logger.log(renderToString(<Text>🕒 Creating backup...</Text>));
+			const accountId = await requireAuth(config);
 			await createBackup(accountId, databaseInfo.uuid);
 		}
 
@@ -169,35 +172,38 @@ Your database may not be available to serve requests during the migration, conti
 				}
 			} catch (e) {
 				const err = e as ParseError;
+				const maybeCause = (err.cause ?? err) as Error;
 
 				success = false;
 				errorNotes = err.notes?.map((msg) => msg.text) ?? [
-					err.message ?? err.toString(),
+					maybeCause?.message ?? maybeCause.toString(),
 				];
 			}
 
 			migration.Status = success ? "✅" : "❌";
 
-			render(
-				<Box flexDirection="column">
-					<Table
-						data={unappliedMigrations}
-						columns={["Name", "Status"]}
-					></Table>
-					{errorNotes.length > 0 && (
-						<Box flexDirection="column">
-							<Text>&nbsp;</Text>
-							<Text>
-								❌ Migration {migration.Name} failed with following Errors
-							</Text>
-							<Table
-								data={errorNotes.map((err) => {
-									return { Error: err };
-								})}
-							></Table>
-						</Box>
-					)}
-				</Box>
+			logger.log(
+				renderToString(
+					<Box flexDirection="column">
+						<Table
+							data={unappliedMigrations}
+							columns={["Name", "Status"]}
+						></Table>
+						{errorNotes.length > 0 && (
+							<Box flexDirection="column">
+								<Text>&nbsp;</Text>
+								<Text>
+									❌ Migration {migration.Name} failed with following Errors
+								</Text>
+								<Table
+									data={errorNotes.map((err) => {
+										return { Error: err };
+									})}
+								></Table>
+							</Box>
+						)}
+					</Box>
+				)
 			);
 
 			if (errorNotes.length > 0) return;

package/src/d1/migrations/create.tsx

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "path";
-import { Box, render, Text } from "ink";
+import { Box, Text } from "ink";
 import React from "react";
 import { withConfig } from "../../config";
 import { logger } from "../../logger";
+import { renderToString } from "../../utils/render";
 import { DEFAULT_MIGRATION_PATH } from "../constants";
 import { Database } from "../options";
 import { d1BetaWarning, getDatabaseInfoFromConfig } from "../utils";
@@ -54,17 +55,19 @@ export const CreateHandler = withConfig<CreateHandlerOptions>(
 			`-- Migration number: ${nextMigrationNumber} \t ${new Date().toISOString()}\n`
 		);
 
-		render(
-			<Box flexDirection="column">
-				<Text>
-					✅ Successfully created Migration &apos;{newMigrationName}&apos;!
-				</Text>
-				<Text>&nbsp;</Text>
-				<Text>The migration is available for editing here</Text>
-				<Text>
-					{migrationsPath}/{newMigrationName}
-				</Text>
-			</Box>
+		logger.log(
+			renderToString(
+				<Box flexDirection="column">
+					<Text>
+						✅ Successfully created Migration &apos;{newMigrationName}&apos;!
+					</Text>
+					<Text>&nbsp;</Text>
+					<Text>The migration is available for editing here</Text>
+					<Text>
+						{migrationsPath}/{newMigrationName}
+					</Text>
+				</Box>
+			)
 		);
 	}
 );

package/src/d1/migrations/helpers.ts

@@ -157,14 +157,11 @@ export const initMigrationsTable = async ({
 		name,
 		shouldPrompt: isInteractive() && !CI.isCI(),
 		persistTo,
-		command: `
-						CREATE TABLE IF NOT EXISTS ${migrationsTableName}
-						(
-								id         INTEGER PRIMARY KEY AUTOINCREMENT,
-								name       TEXT UNIQUE,
-								applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-						);
-				`,
+		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

@@ -1,10 +1,11 @@
 import path from "path";
-import { Box, render, Text } from "ink";
+import { Box, Text } from "ink";
 import Table from "ink-table";
 import React from "react";
 import { withConfig } from "../../config";
 import { logger } from "../../logger";
 import { requireAuth } from "../../user";
+import { renderToString } from "../../utils/render";
 import { DEFAULT_MIGRATION_PATH, DEFAULT_MIGRATION_TABLE } from "../constants";
 import { d1BetaWarning, getDatabaseInfoFromConfig } from "../utils";
 import {
@@ -78,15 +79,17 @@ export const ListHandler = withConfig<ListHandlerOptions>(
 		});
 
 		if (unappliedMigrations.length === 0) {
-			render(<Text>✅ No migrations to apply!</Text>);
+			logger.log(renderToString(<Text>✅ No migrations to apply!</Text>));
 			return;
 		}
 
-		render(
-			<Box flexDirection="column">
-				<Text>Migrations to be applied:</Text>
-				<Table data={unappliedMigrations} columns={["Name"]}></Table>
-			</Box>
+		logger.log(
+			renderToString(
+				<Box flexDirection="column">
+					<Text>Migrations to be applied:</Text>
+					<Table data={unappliedMigrations} columns={["Name"]}></Table>
+				</Box>
+			)
 		);
 	}
 );