wrangler 0.0.0-e2f9bb2 → 0.0.0-e305903a

package/src/d1/list.tsx

@@ -0,0 +1,48 @@
+import { render } from "ink";
+import Table from "ink-table";
+import React from "react";
+import { fetchResult } from "../cfetch";
+import { logger } from "../logger";
+import { requireAuth } from "../user";
+import { d1BetaWarning } from "./utils";
+import type { Database } from "./types";
+import type { ArgumentsCamelCase, Argv } from "yargs";
+
+type ListArgs = Record<string, never>;
+
+export function Options(d1ListYargs: Argv): Argv<ListArgs> {
+	return d1ListYargs.epilogue(d1BetaWarning);
+}
+
+export async function Handler(_: ArgumentsCamelCase<ListArgs>): Promise<void> {
+	const accountId = await requireAuth({});
+	logger.log(d1BetaWarning);
+
+	const dbs: Array<Database> = await listDatabases(accountId);
+
+	render(<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;
+};

package/src/d1/options.ts

@@ -0,0 +1,12 @@
+import { d1BetaWarning } from "./utils";
+import type { Argv } from "yargs";
+
+export function Name(yargs: Argv) {
+	return yargs
+		.positional("name", {
+			describe: "The name or binding of the DB",
+			type: "string",
+			demandOption: true,
+		})
+		.epilogue(d1BetaWarning);
+}

package/src/d1/types.tsx

@@ -0,0 +1,14 @@
+export type Database = {
+	uuid: string;
+	name: string;
+};
+
+export type Backup = {
+	id: string;
+	database_id: string;
+	created_at: string;
+	state: "progress" | "done";
+	num_tables: number;
+	file_size: number;
+	size?: string;
+};

package/src/d1/utils.ts

@@ -0,0 +1,39 @@
+import { listDatabases } from "./list";
+import type { Config } from "../config";
+import type { Database } from "./types";
+
+export function getDatabaseInfoFromConfig(config: Config, name: string) {
+	for (const d1Database of config.d1_databases) {
+		if (
+			d1Database.database_id &&
+			(name === d1Database.database_name || name === d1Database.binding)
+		) {
+			return {
+				uuid: d1Database.database_id,
+				binding: d1Database.binding,
+				name: d1Database.database_name,
+			};
+		}
+	}
+	return null;
+}
+
+export const getDatabaseByNameOrBinding = async (
+	config: Config,
+	accountId: string,
+	name: string
+): Promise<Database> => {
+	const dbFromConfig = getDatabaseInfoFromConfig(config, name);
+	if (dbFromConfig) return dbFromConfig;
+
+	const allDBs = await listDatabases(accountId);
+	const matchingDB = allDBs.find((db) => db.name === name);
+	if (!matchingDB) {
+		throw new Error(`Couldn't find DB with name '${name}'`);
+	}
+	return matchingDB;
+};
+
+export const d1BetaWarning = process.env.NO_D1_WARNING
+	? ""
+	: "🚧 'wrangler d1 <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";

package/src/dev/dev-vars.ts

@@ -20,17 +20,17 @@ import type { Config } from "../config";
  * bindings provided in the `wrangler.toml`.
  */
 export function getVarsForDev(config: Config): Config["vars"] {
-  const configDir = path.resolve(path.dirname(config.configPath ?? "."));
-  const devVarsPath = path.resolve(configDir, ".dev.vars");
-  if (fs.existsSync(devVarsPath)) {
-    const devVarsRelativePath = path.relative(process.cwd(), devVarsPath);
-    logger.log(`Using vars defined in ${devVarsRelativePath}`);
-    const devVars = dotenv.parse(fs.readFileSync(devVarsPath, "utf8"));
-    return {
-      ...config.vars,
-      ...devVars,
-    };
-  } else {
-    return config.vars;
-  }
+	const configDir = path.resolve(path.dirname(config.configPath ?? "."));
+	const devVarsPath = path.resolve(configDir, ".dev.vars");
+	if (fs.existsSync(devVarsPath)) {
+		const devVarsRelativePath = path.relative(process.cwd(), devVarsPath);
+		logger.log(`Using vars defined in ${devVarsRelativePath}`);
+		const devVars = dotenv.parse(fs.readFileSync(devVarsPath, "utf8"));
+		return {
+			...config.vars,
+			...devVars,
+		};
+	} else {
+		return config.vars;
+	}
 }