wrangler 3.60.1 → 3.60.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.60.1",
+  "version": "3.60.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -149,10 +149,10 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "^0.11.42",
     "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/pages-shared": "^0.11.42"
+    "@cloudflare/cli": "1.1.1"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"

package/wrangler-dist/cli.js

@@ -152685,7 +152685,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.60.1";
+var version = "3.60.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -176807,7 +176807,6 @@ function Options7(d1ListYargs) {
     type: "string",
     demandOption: true
   }).option("timePeriod", {
-    choices: ["1d", "7d", "31d"],
     describe: "Fetch data from now to the provided time period",
     default: "1d"
   }).option("sort-type", {
@@ -176839,6 +176838,42 @@ var cliOptionToGraphQLOption = {
   writes: "rowsWritten",
   count: "count"
 };
+function getDurationDates(durationString) {
+  const endDate = /* @__PURE__ */ new Date();
+  const durationValue = parseInt(durationString.slice(0, -1));
+  const durationUnit = durationString.slice(-1);
+  let startDate;
+  switch (durationUnit) {
+    case "d":
+      if (durationValue > 31) {
+        throw new Error("Duration cannot be greater than 31 days");
+      }
+      startDate = new Date(
+        endDate.getTime() - durationValue * 24 * 60 * 60 * 1e3
+      );
+      break;
+    case "m":
+      if (durationValue > 31 * 24 * 60) {
+        throw new Error(
+          `Duration cannot be greater than ${31 * 24 * 60} minutes (31 days)`
+        );
+      }
+      startDate = new Date(endDate.getTime() - durationValue * 60 * 1e3);
+      break;
+    case "h":
+      if (durationValue > 31 * 24) {
+        throw new Error(
+          `Duration cannot be greater than ${31 * 24} hours (31 days)`
+        );
+      }
+      startDate = new Date(endDate.getTime() - durationValue * 60 * 60 * 1e3);
+      break;
+    default:
+      throw new Error("Invalid duration unit");
+  }
+  return [startDate.toISOString(), endDate.toISOString()];
+}
+__name(getDurationDates, "getDurationDates");
 var Handler7 = withConfig(
   async ({
     name,
@@ -176859,11 +176894,7 @@ var Handler7 = withConfig(
     const result = await getDatabaseInfoFromId(accountId, db.uuid);
     const output = [];
     if (result.version !== "alpha") {
-      const convertedTimePeriod = Number(timePeriod.replace("d", ""));
-      const endDate = /* @__PURE__ */ new Date();
-      const startDate = new Date(
-        new Date(endDate).setDate(endDate.getDate() - convertedTimePeriod)
-      );
+      const [startDate, endDate] = getDurationDates(timePeriod);
       const parsedSortBy = cliOptionToGraphQLOption[sortBy];
       const orderByClause = parsedSortBy === "count" ? `${parsedSortBy}_${sortDirection}` : `${sortType}_${parsedSortBy}_${sortDirection}`;
       const graphqlQueriesResult = await fetchGraphqlResult({
@@ -176897,8 +176928,8 @@ var Handler7 = withConfig(
             filter: {
               AND: [
                 {
-                  datetimeHour_geq: startDate.toISOString(),
-                  datetimeHour_leq: endDate.toISOString(),
+                  datetimeHour_geq: startDate,
+                  datetimeHour_leq: endDate,
                   databaseId: db.uuid
                 }
               ]
@@ -209362,4 +209393,3 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
-//# sourceMappingURL=cli.js.map