wrangler 2.8.1 → 2.9.0

package/src/secret/index.ts

@@ -13,14 +13,12 @@ import * as metrics from "../metrics";
 import { parseJSON, readFileSync } from "../parse";
 import { requireAuth } from "../user";
 
-import type { ConfigPath } from "../index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
-import type { Argv } from "yargs";
 
-export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
+export const secret = (secretYargs: CommonYargsArgv) => {
 	return secretYargs
 		.option("legacy-env", {
 			type: "boolean",
@@ -44,7 +42,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 			},
 			async (args) => {
 				await printWranglerBanner();
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -172,7 +170,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 					});
 			},
 			async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -222,7 +220,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 				});
 			},
 			async (args) => {
-				const config = readConfig(args.config as ConfigPath, args);
+				const config = readConfig(args.config, args);
 
 				const scriptName = getLegacyScriptName(args, config);
 				if (!scriptName) {
@@ -246,7 +244,7 @@ export const secret = (secretYargs: Argv<CommonYargsOptions>) => {
 		);
 };
 
-export const secretBulkOptions = (yargs: Argv<CommonYargsOptions>) => {
+export const secretBulkOptions = (yargs: CommonYargsArgv) => {
 	return yargs
 		.positional("json", {
 			describe: `The JSON file of key-value pairs to upload, in form {"key": value, ...}`,
@@ -301,14 +299,11 @@ function readFromStdin(): Promise<string> {
 	});
 }
 
-type SecretBulkArgs = YargsOptionsToInterface<typeof secretBulkOptions>;
+type SecretBulkArgs = StrictYargsOptionsToInterface<typeof secretBulkOptions>;
 
 export const secretBulkHandler = async (secretBulkArgs: SecretBulkArgs) => {
 	await printWranglerBanner();
-	const config = readConfig(
-		secretBulkArgs.config as ConfigPath,
-		secretBulkArgs
-	);
+	const config = readConfig(secretBulkArgs.config, secretBulkArgs);
 
 	const scriptName = getLegacyScriptName(secretBulkArgs, config);
 	if (!scriptName) {

package/src/tail/index.ts

@@ -20,16 +20,14 @@ import {
 	translateCLICommandToFilterMessage,
 } from "./createTail";
 import type { WorkerMetadata } from "../create-worker-upload-form";
-import type { ConfigPath } from "../index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
 import type { TailCLIFilters } from "./createTail";
 import type { RawData } from "ws";
-import type { Argv } from "yargs";
 
-export function tailOptions(yargs: Argv<CommonYargsOptions>) {
+export function tailOptions(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("worker", {
 			describe: "Name or route of the worker to tail",
@@ -86,13 +84,13 @@ export function tailOptions(yargs: Argv<CommonYargsOptions>) {
 		});
 }
 
-type TailArgs = YargsOptionsToInterface<typeof tailOptions>;
+type TailArgs = StrictYargsOptionsToInterface<typeof tailOptions>;
 
 export async function tailHandler(args: TailArgs) {
 	if (args.format === "pretty") {
 		await printWranglerBanner();
 	}
-	const config = readConfig(args.config as ConfigPath, args);
+	const config = readConfig(args.config, args);
 	await metrics.sendMetricsEvent("begin log stream", {
 		sendMetrics: config.send_metrics,
 	});
@@ -121,7 +119,7 @@ export async function tailHandler(args: TailArgs) {
 		status: args.status as ("ok" | "error" | "canceled")[] | undefined,
 		header: args.header,
 		method: args.method,
-		samplingRate: args["sampling-rate"],
+		samplingRate: args.samplingRate,
 		search: args.search,
 		clientIp: args.ip,
 	};

package/src/yargs-types.ts

@@ -1,3 +1,4 @@
+import type { OnlyCamelCase } from "./config/config";
 import type { ArgumentsCamelCase, Argv } from "yargs";
 
 /**
@@ -7,18 +8,30 @@ export interface CommonYargsOptions {
 	v: boolean | undefined;
 	config: string | undefined;
 	env: string | undefined;
+	"experimental-json-config": boolean | undefined;
 }
 
+export type CommonYargsArgv = Argv<CommonYargsOptions>;
+
 export type YargvToInterface<T> = T extends Argv<infer P>
 	? ArgumentsCamelCase<P>
 	: never;
 
+// See http://stackoverflow.com/questions/51465182/how-to-remove-index-signature-using-mapped-types
+type RemoveIndex<T> = {
+	[K in keyof T as string extends K
+		? never
+		: number extends K
+		? never
+		: K]: T[K];
+};
+
 /**
  * Given some Yargs Options function factory, extract the interface
- * that corresponds to the yargs arguments
+ * that corresponds to the yargs arguments, remove index types, and only allow camelCase
  */
-export type YargsOptionsToInterface<
-	T extends (yargs: Argv<CommonYargsOptions>) => Argv
-> = T extends (yargs: Argv<CommonYargsOptions>) => Argv<infer P>
-	? ArgumentsCamelCase<P>
+export type StrictYargsOptionsToInterface<
+	T extends (yargs: CommonYargsArgv) => Argv
+> = T extends (yargs: CommonYargsArgv) => Argv<infer P>
+	? OnlyCamelCase<RemoveIndex<ArgumentsCamelCase<P>>>
 	: never;

package/templates/checked-fetch.js

@@ -1,7 +1,15 @@
 const urls = new Set();
 
 export function checkedFetch(request, init) {
-	const url = new URL(new Request(request, init).url);
+	const url =
+		request instanceof URL
+			? request
+			: new URL(
+					(typeof request === "string"
+						? new Request(request, init)
+						: request
+					).url
+			  );
 	if (url.port && url.port !== "443" && url.protocol === "https:") {
 		if (!urls.has(url.toString())) {
 			urls.add(url.toString());