wrangler 3.78.3 → 3.78.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.78.3",
+  "version": "3.78.4",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -66,8 +66,8 @@
     "workerd": "1.20240909.0",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "@cloudflare/workers-shared": "0.5.3",
-    "miniflare": "3.20240909.2"
+    "miniflare": "3.20240909.2",
+    "@cloudflare/workers-shared": "0.5.3"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",

package/wrangler-dist/cli.js

@@ -152876,7 +152876,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.78.3";
+var version = "3.78.4";
 var package_default = {
   name: "wrangler",
   version,
@@ -161421,7 +161421,9 @@ function createWorkerUploadForm(worker) {
         assets: {
           jwt: experimental_assets.jwt,
           config: assetConfig
-        }
+        },
+        ...compatibility_date && { compatibility_date },
+        ...compatibility_flags && { compatibility_flags }
       })
     );
     return formData;
@@ -191729,7 +191731,6 @@ async function handler5(args) {
     args.host,
     args.port,
     args.scheme,
-    args.database,
     args.user,
     args.password
   );
@@ -191752,9 +191753,9 @@ async function handler5(args) {
     throw new UserError(
       "You must provide a port number - e.g. 'user:password@database.example.com:port/databasename"
     );
-  } else if (url4.pathname === "") {
+  } else if (args.connectionString && url4.pathname === "" || args.database === "") {
     throw new UserError(
-      "You must provide a database name as the path component - e.g. /postgres"
+      "You must provide a database name as the path component - e.g. example.com:port/postgres"
     );
   } else if (url4.username === "") {
     throw new UserError(
@@ -191767,9 +191768,9 @@ async function handler5(args) {
   } else {
     logger.log(`\u{1F6A7} Creating '${args.name}'`);
     const origin = args.accessClientId && args.accessClientSecret ? {
-      host: url4.hostname,
+      host: url4.hostname + url4.pathname,
       scheme: url4.protocol.replace(":", ""),
-      database: decodeURIComponent(url4.pathname.replace("/", "")),
+      database: args.database,
       user: decodeURIComponent(url4.username),
       password: decodeURIComponent(url4.password),
       access_client_id: args.accessClientId,
@@ -191778,7 +191779,8 @@ async function handler5(args) {
       host: url4.hostname,
       port: parseInt(url4.port),
       scheme: url4.protocol.replace(":", ""),
-      database: decodeURIComponent(url4.pathname.replace("/", "")),
+      // database will either be the value passed in the relevant yargs flag or is URL-decoded value from the url pathname
+      database: args.connectionString !== "" ? decodeURIComponent(url4.pathname.replace("/", "")) : args.database,
       user: decodeURIComponent(url4.username),
       password: decodeURIComponent(url4.password)
     };
@@ -191799,8 +191801,8 @@ async function handler5(args) {
   }
 }
 __name(handler5, "handler");
-function buildURLFromParts(host, port2, scheme, database, user, password) {
-  const url4 = new URL(database ? `/${database}` : "", `${scheme}://${host}`);
+function buildURLFromParts(host, port2, scheme, user, password) {
+  const url4 = new URL(`${scheme}://${host}`);
   if (port2) {
     url4.port = port2.toString();
   }
@@ -191884,11 +191886,13 @@ function options8(yargs) {
     name: { type: "string", describe: "Give your config a new name" },
     "origin-host": {
       type: "string",
-      describe: "The host of the origin database"
+      describe: "The host of the origin database",
+      implies: ["database", "origin-user", "origin-password"]
     },
     "origin-port": {
       type: "number",
-      describe: "The port number of the origin database"
+      describe: "The port number of the origin database",
+      implies: ["origin-host", "database", "origin-user", "origin-password"]
     },
     "origin-scheme": {
       type: "string",
@@ -191896,27 +191900,42 @@ function options8(yargs) {
     },
     database: {
       type: "string",
-      describe: "The name of the database within the origin database"
+      describe: "The name of the database within the origin database",
+      implies: ["origin-host", "origin-user", "origin-password"]
     },
     "origin-user": {
       type: "string",
-      describe: "The username used to connect to the origin database"
+      describe: "The username used to connect to the origin database",
+      implies: ["origin-host", "database", "origin-password"]
     },
     "origin-password": {
       type: "string",
-      describe: "The password used to connect to the origin database"
+      describe: "The password used to connect to the origin database",
+      implies: ["origin-host", "database", "origin-user"]
     },
     "access-client-id": {
       type: "string",
       describe: "The Client ID of the Access token to use when connecting to the origin database",
       conflicts: ["origin-port"],
-      implies: ["access-client-secret"]
+      implies: [
+        "access-client-secret",
+        "origin-host",
+        "database",
+        "origin-user",
+        "origin-password"
+      ]
     },
     "access-client-secret": {
       type: "string",
       describe: "The Client Secret of the Access token to use when connecting to the origin database",
       conflicts: ["origin-port"],
-      implies: ["access-client-id"]
+      implies: [
+        "access-client-id",
+        "origin-host",
+        "database",
+        "origin-user",
+        "origin-password"
+      ]
     },
     "caching-disabled": {
       type: "boolean",
@@ -191934,33 +191953,21 @@ function options8(yargs) {
   });
 }
 __name(options8, "options");
-var requiredOriginOptions = [
+var coreOriginOptions = [
   "originHost",
   "database",
   "originUser",
   "originPassword"
 ];
-function camelToKebab(str) {
-  return str.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
-}
-__name(camelToKebab, "camelToKebab");
 function isOptionSet(args, key) {
   return key in args && args[key] !== void 0;
 }
 __name(isOptionSet, "isOptionSet");
 async function handler9(args) {
-  const allOriginFieldsSet = requiredOriginOptions.every(
+  const coreOriginFieldsSet = coreOriginOptions.every(
     (field) => isOptionSet(args, field)
   );
-  const noOriginFieldSet = requiredOriginOptions.every(
-    (field) => !isOptionSet(args, field)
-  );
-  if (!allOriginFieldsSet && !noOriginFieldSet) {
-    throw new UserError(
-      `When updating the origin, all of the following must be set: ${requiredOriginOptions.map((option) => camelToKebab(option)).join(", ")}`
-    );
-  }
-  if (allOriginFieldsSet && args.originPort === void 0 && args.accessClientId === void 0 && args.accessClientSecret === void 0) {
+  if (coreOriginFieldsSet && args.originPort === void 0 && args.accessClientId === void 0 && args.accessClientSecret === void 0) {
     throw new UserError(
       `When updating the origin, either the port or the Access Client ID and Secret must be set`
     );
@@ -191971,7 +191978,7 @@ async function handler9(args) {
   if (args.name !== void 0) {
     database.name = args.name;
   }
-  if (allOriginFieldsSet) {
+  if (coreOriginFieldsSet) {
     if (args.accessClientId && args.accessClientSecret) {
       database.origin = {
         scheme: args.originScheme ?? "postgresql",
@@ -199312,13 +199319,20 @@ async function deleteEventNotificationConfig(config, apiCredentials, accountId,
   logger.log(
     `Disabling event notifications for "${bucketName}" to queue ${queueName}...`
   );
-  const body = ruleId !== void 0 ? {
-    ruleIds: [ruleId]
-  } : {};
-  return await fetchResult(
-    `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
-    { method: "DELETE", body: JSON.stringify(body), headers }
-  );
+  if (ruleId !== void 0) {
+    const body = ruleId !== void 0 ? {
+      ruleIds: [ruleId]
+    } : {};
+    return await fetchResult(
+      `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
+      { method: "DELETE", body: JSON.stringify(body), headers }
+    );
+  } else {
+    return await fetchResult(
+      `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
+      { method: "DELETE", headers }
+    );
+  }
 }
 __name(deleteEventNotificationConfig, "deleteEventNotificationConfig");
 function isValidR2BucketName(name) {
@@ -199356,21 +199370,21 @@ function CreateOptions4(yargs) {
     type: "string",
     demandOption: true
   }).option("event-types", {
-    describe: "Specify the kinds of object events to emit notifications for. ex. '--event-types object-create object-delete'",
+    describe: "The type of event(s) that will emit event notifications",
     alias: "event-type",
     choices: Object.keys(actionsForEventCategories),
     demandOption: true,
     requiresArg: true,
     type: "array"
   }).option("prefix", {
-    describe: "only actions on objects with this prefix will emit notifications",
+    describe: "The prefix that an object must match to emit event notifications (note: regular expressions not supported)",
     requiresArg: false,
     type: "string"
   }).option("suffix", {
-    describe: "only actions on objects with this suffix will emit notifications",
+    describe: "The suffix that an object must match to emit event notifications (note: regular expressions not supported)",
     type: "string"
   }).option("queue", {
-    describe: "The name of the queue to which event notifications will be sent. ex '--queue my-queue'",
+    describe: "The name of the queue that will receive event notification messages",
     demandOption: true,
     requiresArg: true,
     type: "string"
@@ -199402,12 +199416,12 @@ function DeleteOptions2(yargs) {
     type: "string",
     demandOption: true
   }).option("queue", {
-    describe: "The name of the queue that is configured to receive notifications. ex '--queue my-queue'",
+    describe: "The name of the queue that will receive event notification messages",
     demandOption: true,
     requiresArg: true,
     type: "string"
   }).option("rule", {
-    describe: "The id of the rule to delete. If no rule is specified, all rules for the bucket/queue configuration will be deleted.",
+    describe: "The id of the rule to delete. If no rule is specified, all rules for the bucket/queue configuration will be deleted",
     requiresArg: false,
     type: "string"
   });
@@ -218066,3 +218080,4 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
+//# sourceMappingURL=cli.js.map