wrangler 2.3.1 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.3.1",
+	"version": "2.3.2",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/d1/execute.tsx

@@ -1,6 +1,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 Table from "ink-table";
 import { npxImport } from "npx-import";
@@ -141,7 +142,7 @@ export const Handler = withConfig<ExecuteArgs>(
 	}): Promise<void> => {
 		logger.log(d1BetaWarning);
 		if (file && command)
-			return console.error(`Error: can't provide both --command and --file.`);
+			return logger.error(`Error: can't provide both --command and --file.`);
 
 		const isInteractive = process.stdout.isTTY;
 		const response: QueryResult[] | null = await executeSql(
@@ -180,7 +181,7 @@ export const Handler = withConfig<ExecuteArgs>(
 				</Static>
 			);
 		} else {
-			console.log(JSON.stringify(response, null, 2));
+			logger.log(JSON.stringify(response, null, 2));
 		}
 	}
 );
@@ -250,7 +251,7 @@ async function executeRemotely(
 			if (!ok) return null;
 			logger.log(`🌀 Let's go`);
 		} else {
-			console.error(warning);
+			logger.error(warning);
 		}
 	}
 
@@ -267,11 +268,16 @@ async function executeRemotely(
 		// Don't output if shouldPrompt is undefined
 	} else if (shouldPrompt !== undefined) {
 		// Pipe to error so we don't break jq
-		console.error(`Executing on ${name} (${db.uuid}):`);
+		logger.error(`Executing on ${name} (${db.uuid}):`);
 	}
 
 	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/${db.uuid}/query`,
 			{
@@ -317,16 +323,18 @@ function splitSql(splitter: (query: SQLQuery) => SQLQuery[], sql: SQLQuery) {
 
 function batchSplit(queries: string[]) {
 	logger.log(`🌀 Parsing ${queries.length} statements`);
-	const batches: string[] = [];
 	const num_batches = Math.ceil(queries.length / QUERY_LIMIT);
+	const batches: string[] = [];
 	for (let i = 0; i < num_batches; i++) {
 		batches.push(
 			queries.slice(i * QUERY_LIMIT, (i + 1) * QUERY_LIMIT).join("; ")
 		);
 	}
-	logger.log(
-		`🌀 We are sending ${batches.length} batch(es) to D1 (limited to ${QUERY_LIMIT} statements per batch)`
-	);
+	if (num_batches > 1) {
+		logger.log(
+			`🌀 We are sending ${num_batches} batch(es) to D1 (limited to ${QUERY_LIMIT} statements per batch)`
+		);
+	}
 	return batches;
 }
 

package/wrangler-dist/cli.js

@@ -73766,14 +73766,14 @@ var require_templates = __commonJS({
       }
       return results;
     }
-    function buildStyle(chalk7, styles) {
+    function buildStyle(chalk8, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk7;
+      let current = chalk8;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -73785,7 +73785,7 @@ var require_templates = __commonJS({
       }
       return current;
     }
-    module2.exports = (chalk7, temporary) => {
+    module2.exports = (chalk8, temporary) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -73795,13 +73795,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? string : buildStyle(chalk7, styles)(string));
+          chunks.push(styles.length === 0 ? string : buildStyle(chalk8, styles)(string));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk7, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk8, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -73850,16 +73850,16 @@ var require_source = __commonJS({
       }
     };
     var chalkFactory = (options6) => {
-      const chalk8 = {};
-      applyOptions(chalk8, options6);
-      chalk8.template = (...arguments_) => chalkTag(chalk8.template, ...arguments_);
-      Object.setPrototypeOf(chalk8, Chalk.prototype);
-      Object.setPrototypeOf(chalk8.template, chalk8);
-      chalk8.template.constructor = () => {
+      const chalk9 = {};
+      applyOptions(chalk9, options6);
+      chalk9.template = (...arguments_) => chalkTag(chalk9.template, ...arguments_);
+      Object.setPrototypeOf(chalk9, Chalk.prototype);
+      Object.setPrototypeOf(chalk9.template, chalk9);
+      chalk9.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk8.template.Instance = ChalkClass;
-      return chalk8.template;
+      chalk9.template.Instance = ChalkClass;
+      return chalk9.template;
     };
     function Chalk(options6) {
       return chalkFactory(options6);
@@ -73970,7 +73970,7 @@ var require_source = __commonJS({
       return openAll + string + closeAll;
     };
     var template;
-    var chalkTag = (chalk8, ...strings) => {
+    var chalkTag = (chalk9, ...strings) => {
       const [firstString] = strings;
       if (!isArray(firstString) || !isArray(firstString.raw)) {
         return strings.join(" ");
@@ -73986,14 +73986,14 @@ var require_source = __commonJS({
       if (template === void 0) {
         template = require_templates();
       }
-      return template(chalk8, parts.join(""));
+      return template(chalk9, parts.join(""));
     };
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk7 = Chalk();
-    chalk7.supportsColor = stdoutColor;
-    chalk7.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk7.stderr.supportsColor = stderrColor;
-    module2.exports = chalk7;
+    var chalk8 = Chalk();
+    chalk8.supportsColor = stdoutColor;
+    chalk8.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk8.stderr.supportsColor = stderrColor;
+    module2.exports = chalk8;
   }
 });
 
@@ -122907,14 +122907,14 @@ var require_templates2 = __commonJS({
       }
       return results;
     }
-    function buildStyle(chalk7, styles) {
+    function buildStyle(chalk8, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk7;
+      let current = chalk8;
       for (const styleName of Object.keys(enabled)) {
         if (Array.isArray(enabled[styleName])) {
           if (!(styleName in current)) {
@@ -122929,7 +122929,7 @@ var require_templates2 = __commonJS({
       }
       return current;
     }
-    module2.exports = (chalk7, tmp5) => {
+    module2.exports = (chalk8, tmp5) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -122939,13 +122939,13 @@ var require_templates2 = __commonJS({
         } else if (style) {
           const str = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? str : buildStyle(chalk7, styles)(str));
+          chunks.push(styles.length === 0 ? str : buildStyle(chalk8, styles)(str));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk7, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk8, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -122983,16 +122983,16 @@ var require_chalk = __commonJS({
     }
     function Chalk(options6) {
       if (!this || !(this instanceof Chalk) || this.template) {
-        const chalk7 = {};
-        applyOptions(chalk7, options6);
-        chalk7.template = function() {
+        const chalk8 = {};
+        applyOptions(chalk8, options6);
+        chalk8.template = function() {
           const args = [].slice.call(arguments);
-          return chalkTag.apply(null, [chalk7.template].concat(args));
+          return chalkTag.apply(null, [chalk8.template].concat(args));
         };
-        Object.setPrototypeOf(chalk7, Chalk.prototype);
-        Object.setPrototypeOf(chalk7.template, chalk7);
-        chalk7.template.constructor = Chalk;
-        return chalk7.template;
+        Object.setPrototypeOf(chalk8, Chalk.prototype);
+        Object.setPrototypeOf(chalk8.template, chalk8);
+        chalk8.template.constructor = Chalk;
+        return chalk8.template;
       }
       applyOptions(this, options6);
     }
@@ -123111,7 +123111,7 @@ var require_chalk = __commonJS({
       ansiStyles.dim.open = originalDim;
       return str;
     }
-    function chalkTag(chalk7, strings) {
+    function chalkTag(chalk8, strings) {
       if (!Array.isArray(strings)) {
         return [].slice.call(arguments, 1).join(" ");
       }
@@ -123121,7 +123121,7 @@ var require_chalk = __commonJS({
         parts.push(String(args[i2 - 1]).replace(/[{}\\]/g, "\\$&"));
         parts.push(String(strings.raw[i2]));
       }
-      return template(chalk7, parts.join(""));
+      return template(chalk8, parts.join(""));
     }
     Object.defineProperties(Chalk.prototype, styles);
     module2.exports = Chalk();
@@ -131039,14 +131039,14 @@ var require_templates3 = __commonJS({
       }
       return results;
     }
-    function buildStyle(chalk7, styles) {
+    function buildStyle(chalk8, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk7;
+      let current = chalk8;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -131058,7 +131058,7 @@ var require_templates3 = __commonJS({
       }
       return current;
     }
-    module2.exports = (chalk7, temporary) => {
+    module2.exports = (chalk8, temporary) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -131068,13 +131068,13 @@ var require_templates3 = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? string : buildStyle(chalk7, styles)(string));
+          chunks.push(styles.length === 0 ? string : buildStyle(chalk8, styles)(string));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk7, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk8, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -131123,16 +131123,16 @@ var require_source2 = __commonJS({
       }
     };
     var chalkFactory = (options6) => {
-      const chalk8 = {};
-      applyOptions(chalk8, options6);
-      chalk8.template = (...arguments_) => chalkTag(chalk8.template, ...arguments_);
-      Object.setPrototypeOf(chalk8, Chalk.prototype);
-      Object.setPrototypeOf(chalk8.template, chalk8);
-      chalk8.template.constructor = () => {
+      const chalk9 = {};
+      applyOptions(chalk9, options6);
+      chalk9.template = (...arguments_) => chalkTag(chalk9.template, ...arguments_);
+      Object.setPrototypeOf(chalk9, Chalk.prototype);
+      Object.setPrototypeOf(chalk9.template, chalk9);
+      chalk9.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk8.template.Instance = ChalkClass;
-      return chalk8.template;
+      chalk9.template.Instance = ChalkClass;
+      return chalk9.template;
     };
     function Chalk(options6) {
       return chalkFactory(options6);
@@ -131243,7 +131243,7 @@ var require_source2 = __commonJS({
       return openAll + string + closeAll;
     };
     var template;
-    var chalkTag = (chalk8, ...strings) => {
+    var chalkTag = (chalk9, ...strings) => {
       const [firstString] = strings;
       if (!isArray(firstString) || !isArray(firstString.raw)) {
         return strings.join(" ");
@@ -131259,14 +131259,14 @@ var require_source2 = __commonJS({
       if (template === void 0) {
         template = require_templates3();
       }
-      return template(chalk8, parts.join(""));
+      return template(chalk9, parts.join(""));
     };
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk7 = Chalk();
-    chalk7.supportsColor = stdoutColor;
-    chalk7.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk7.stderr.supportsColor = stderrColor;
-    module2.exports = chalk7;
+    var chalk8 = Chalk();
+    chalk8.supportsColor = stdoutColor;
+    chalk8.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk8.stderr.supportsColor = stderrColor;
+    module2.exports = chalk8;
   }
 });
 
@@ -131280,7 +131280,7 @@ var require_build4 = __commonJS({
     var React18 = require_react();
     var react_1 = require_react();
     var ink_1 = require_build2();
-    var chalk7 = require_source2();
+    var chalk8 = require_source2();
     var TextInput2 = ({ value: originalValue, placeholder = "", focus = true, mask: mask2, highlightPastedText = false, showCursor = true, onChange, onSubmit }) => {
       const [{ cursorOffset, cursorWidth }, setState] = react_1.useState({
         cursorOffset: (originalValue || "").length,
@@ -131304,21 +131304,21 @@ var require_build4 = __commonJS({
       const cursorActualWidth = highlightPastedText ? cursorWidth : 0;
       const value = mask2 ? mask2.repeat(originalValue.length) : originalValue;
       let renderedValue = value;
-      let renderedPlaceholder = placeholder ? chalk7.grey(placeholder) : void 0;
+      let renderedPlaceholder = placeholder ? chalk8.grey(placeholder) : void 0;
       if (showCursor && focus) {
-        renderedPlaceholder = placeholder.length > 0 ? chalk7.inverse(placeholder[0]) + chalk7.grey(placeholder.slice(1)) : chalk7.inverse(" ");
-        renderedValue = value.length > 0 ? "" : chalk7.inverse(" ");
+        renderedPlaceholder = placeholder.length > 0 ? chalk8.inverse(placeholder[0]) + chalk8.grey(placeholder.slice(1)) : chalk8.inverse(" ");
+        renderedValue = value.length > 0 ? "" : chalk8.inverse(" ");
         let i2 = 0;
         for (const char of value) {
           if (i2 >= cursorOffset - cursorActualWidth && i2 <= cursorOffset) {
-            renderedValue += chalk7.inverse(char);
+            renderedValue += chalk8.inverse(char);
           } else {
             renderedValue += char;
           }
           i2++;
         }
         if (value.length > 0 && cursorOffset === value.length) {
-          renderedValue += chalk7.inverse(" ");
+          renderedValue += chalk8.inverse(" ");
         }
       }
       ink_1.useInput((input, key2) => {
@@ -141159,7 +141159,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.3.1";
+var version = "2.3.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -147622,7 +147622,7 @@ async function getWorkerForZone(worker) {
 init_import_meta_url();
 var import_node_os14 = __toESM(require("node:os"));
 var import_toml5 = __toESM(require_toml());
-var import_chalk6 = __toESM(require_chalk());
+var import_chalk7 = __toESM(require_chalk());
 
 // node_modules/supports-color/index.js
 init_import_meta_url();
@@ -153887,6 +153887,7 @@ init_import_meta_url();
 var import_node_fs10 = require("node:fs");
 var import_promises8 = require("node:fs/promises");
 var import_node_path19 = __toESM(require("node:path"));
+var import_chalk3 = __toESM(require_chalk());
 var import_ink9 = __toESM(require_build2());
 var import_ink_table4 = __toESM(require_dist2());
 var import_react13 = __toESM(require_react());
@@ -153943,7 +153944,7 @@ var Handler4 = withConfig(
   }) => {
     logger.log(d1BetaWarning);
     if (file && command2)
-      return console.error(`Error: can't provide both --command and --file.`);
+      return logger.error(`Error: can't provide both --command and --file.`);
     const isInteractive2 = process.stdout.isTTY;
     const response = await executeSql(
       local,
@@ -153975,7 +153976,7 @@ var Handler4 = withConfig(
         })
       );
     } else {
-      console.log(JSON.stringify(response, null, 2));
+      logger.log(JSON.stringify(response, null, 2));
     }
   }
 );
@@ -154028,7 +154029,7 @@ async function executeRemotely(config, name, shouldPrompt, batches) {
         return null;
       logger.log(`\u{1F300} Let's go`);
     } else {
-      console.error(warning);
+      logger.error(warning);
     }
   }
   const accountId = await requireAuth({});
@@ -154040,10 +154041,14 @@ async function executeRemotely(config, name, shouldPrompt, batches) {
   if (shouldPrompt) {
     logger.log(`\u{1F300} Executing on ${name} (${db.uuid}):`);
   } else if (shouldPrompt !== void 0) {
-    console.error(`Executing on ${name} (${db.uuid}):`);
+    logger.error(`Executing on ${name} (${db.uuid}):`);
   }
   const results = [];
   for (const sql of batches) {
+    if (multiple_batches)
+      logger.log(
+        import_chalk3.default.gray(`  ${sql.slice(0, 70)}${sql.length > 70 ? "..." : ""}`)
+      );
     const result = await fetchResult(
       `/accounts/${accountId}/d1/database/${db.uuid}/query`,
       {
@@ -154076,16 +154081,18 @@ function splitSql(splitter, sql) {
 }
 function batchSplit(queries) {
   logger.log(`\u{1F300} Parsing ${queries.length} statements`);
-  const batches = [];
   const num_batches = Math.ceil(queries.length / QUERY_LIMIT);
+  const batches = [];
   for (let i2 = 0; i2 < num_batches; i2++) {
     batches.push(
       queries.slice(i2 * QUERY_LIMIT, (i2 + 1) * QUERY_LIMIT).join("; ")
     );
   }
-  logger.log(
-    `\u{1F300} We are sending ${batches.length} batch(es) to D1 (limited to ${QUERY_LIMIT} statements per batch)`
-  );
+  if (num_batches > 1) {
+    logger.log(
+      `\u{1F300} We are sending ${num_batches} batch(es) to D1 (limited to ${QUERY_LIMIT} statements per batch)`
+    );
+  }
   return batches;
 }
 async function loadSqlUtils() {
@@ -159862,7 +159869,7 @@ var import_node_assert10 = __toESM(require("node:assert"));
 var import_node_fs20 = require("node:fs");
 var import_node_path35 = __toESM(require("node:path"));
 var import_node_url12 = require("node:url");
-var import_chalk4 = __toESM(require_chalk());
+var import_chalk5 = __toESM(require_chalk());
 var import_tmp_promise4 = __toESM(require_tmp_promise());
 
 // src/durable.ts
@@ -160000,7 +160007,7 @@ async function putConsumer(config, queueName, scriptName, envName, body) {
 
 // src/routes.ts
 init_import_meta_url();
-var import_chalk3 = __toESM(require_chalk());
+var import_chalk4 = __toESM(require_chalk());
 async function getWorkersDevSubdomain(accountId) {
   try {
     const { subdomain } = await fetchResult(
@@ -160060,8 +160067,8 @@ async function registerSubdomain(accountId) {
       }
     }
     const ok = await confirm(
-      `Creating a workers.dev subdomain for your account at ${import_chalk3.default.blue(
-        import_chalk3.default.underline(`https://${potentialName}.workers.dev`)
+      `Creating a workers.dev subdomain for your account at ${import_chalk4.default.blue(
+        import_chalk4.default.underline(`https://${potentialName}.workers.dev`)
       )}. Ok to proceed?`
     );
     if (!ok) {
@@ -160097,8 +160104,8 @@ ${onboardingLink}`);
   }
   logger.log("Success! It may take a few minutes for DNS records to update.");
   logger.log(
-    `Visit ${import_chalk3.default.blue(
-      import_chalk3.default.underline(
+    `Visit ${import_chalk4.default.blue(
+      import_chalk4.default.underline(
         `https://dash.cloudflare.com/${accountId}/workers/subdomain`
       )
     )} to edit your workers.dev subdomain`
@@ -160565,13 +160572,13 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           const assignedRoutes = routesWithOtherBindings[worker];
           errorMessage += `"${worker}" is already assigned to routes:
 ${assignedRoutes.map(
-            (r) => `  - ${import_chalk4.default.underline(r)}
+            (r) => `  - ${import_chalk5.default.underline(r)}
 `
           )}`;
         }
         const resolution = "Unassign other workers from the routes you want to publish to, and then try again.";
-        const dashLink = `Visit ${import_chalk4.default.blue(
-          import_chalk4.default.underline(
+        const dashLink = `Visit ${import_chalk5.default.blue(
+          import_chalk5.default.underline(
             `https://dash.cloudflare.com/${accountId}/workers/overview`
           )
         )} to unassign a worker from a route.`;
@@ -162609,7 +162616,7 @@ ${modulesTypeStructure.join("\n")}`;
 
 // src/update-check.ts
 init_import_meta_url();
-var import_chalk5 = __toESM(require_chalk());
+var import_chalk6 = __toESM(require_chalk());
 var import_update_check = __toESM(require_update_check());
 async function updateCheck() {
   let update = null;
@@ -162620,7 +162627,7 @@ async function updateCheck() {
   } catch (err2) {
   }
   if (update)
-    return `(update available ${import_chalk5.default.green(update.latest)})`;
+    return `(update available ${import_chalk6.default.green(update.latest)})`;
   return "";
 }
 
@@ -162734,7 +162741,7 @@ async function printWranglerBanner() {
   }
   const text = ` \u26C5\uFE0F wrangler ${version} ${await updateCheck()}`;
   logger.log(
-    text + "\n" + (supports_color_default.stdout ? import_chalk6.default.hex("#FF8800")("-".repeat(text.length)) : "-".repeat(text.length))
+    text + "\n" + (supports_color_default.stdout ? import_chalk7.default.hex("#FF8800")("-".repeat(text.length)) : "-".repeat(text.length))
   );
 }
 function isLegacyEnv(config) {