wrangler 2.0.2 → 2.0.6

package/src/__tests__/kv.test.ts

@@ -48,10 +48,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -59,15 +56,16 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
             -e, --env      Perform on a specific environment  [string]
-                --preview  Interact with a preview namespace  [boolean]
-          X [ERROR] Not enough non-option arguments: got 0, need at least 1
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -81,10 +79,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -92,15 +87,16 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
             -e, --env      Perform on a specific environment  [string]
-                --preview  Interact with a preview namespace  [boolean]
-          X [ERROR] Unknown arguments: def, ghi
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Unknown arguments: def, ghi
 
           "
         `);
@@ -115,10 +111,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace create <namespace>
+          wrangler kv:namespace create <namespace>
 
           Create a new namespace
 
@@ -126,15 +119,16 @@ describe("wrangler", () => {
             namespace  The name of the new namespace  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
             -e, --env      Perform on a specific environment  [string]
-                --preview  Interact with a preview namespace  [boolean]
-          X [ERROR] The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.
+                --preview  Interact with a preview namespace  [boolean]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.
 
           "
         `);
@@ -286,22 +280,7 @@ describe("wrangler", () => {
                 A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
               `);
         expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:namespace delete
-
-          Deletes a given namespace.
-
-          Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
-
-          Options:
-                --binding       The name of the namespace to delete  [string]
-                --namespace-id  The id of the namespace to delete  [string]
-            -e, --env           Perform on a specific environment  [string]
-                --preview       Interact with a preview namespace  [boolean]
-          X [ERROR] Not able to delete namespace.
+          "X [ERROR] Not able to delete namespace.
 
             A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
@@ -385,6 +364,21 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
+      it("should encode the key in the api request to put a value", async () => {
+        const requests = mockKeyPutRequest("DS9", {
+          key: "%2Fmy-key",
+          value: "my-value",
+        });
+
+        await runWrangler("kv:key put /my-key my-value --namespace-id DS9");
+
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(
+          `"Writing the value \\"my-value\\" to key \\"/my-key\\" on namespace DS9."`
+        );
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
       it("should put a key in a given namespace specified by binding", async () => {
         writeWranglerConfig();
         const requests = mockKeyPutRequest("bound-id", {
@@ -478,10 +472,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -490,10 +481,9 @@ describe("wrangler", () => {
             value  The value to write  [string]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The binding of the namespace to write to  [string]
@@ -502,8 +492,10 @@ describe("wrangler", () => {
                 --preview       Interact with a preview namespace  [boolean]
                 --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path  [string]
-          X [ERROR] Not enough non-option arguments: got 0, need at least 1
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -518,10 +510,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -530,10 +519,9 @@ describe("wrangler", () => {
             value  The value to write  [string]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The binding of the namespace to write to  [string]
@@ -542,8 +530,10 @@ describe("wrangler", () => {
                 --preview       Interact with a preview namespace  [boolean]
                 --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path  [string]
-          X [ERROR] Exactly one of the arguments binding and namespace-id is required
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
           "
         `);
@@ -558,10 +548,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -570,10 +557,9 @@ describe("wrangler", () => {
             value  The value to write  [string]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The binding of the namespace to write to  [string]
@@ -582,8 +568,10 @@ describe("wrangler", () => {
                 --preview       Interact with a preview namespace  [boolean]
                 --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path  [string]
-          X [ERROR] Arguments binding and namespace-id are mutually exclusive
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
           "
         `);
@@ -598,10 +586,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -610,10 +595,9 @@ describe("wrangler", () => {
             value  The value to write  [string]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The binding of the namespace to write to  [string]
@@ -622,8 +606,10 @@ describe("wrangler", () => {
                 --preview       Interact with a preview namespace  [boolean]
                 --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path  [string]
-          X [ERROR] Exactly one of the arguments value and path is required
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments value and path is required
 
           "
         `);
@@ -638,10 +624,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key put <key> [value]
+          wrangler kv:key put <key> [value]
 
           Writes a single key/value pair to the given namespace.
 
@@ -650,10 +633,9 @@ describe("wrangler", () => {
             value  The value to write  [string]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The binding of the namespace to write to  [string]
@@ -662,8 +644,10 @@ describe("wrangler", () => {
                 --preview       Interact with a preview namespace  [boolean]
                 --ttl           Time for which the entries should be visible  [number]
                 --expiration    Time since the UNIX epoch after which the entry expires  [number]
-                --path          Read value from the file at a given path  [string]
-          X [ERROR] Arguments value and path are mutually exclusive
+                --path          Read value from the file at a given path  [string]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments value and path are mutually exclusive
 
           "
         `);
@@ -937,6 +921,20 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
+      it("should encode the key in the api request to get a value", async () => {
+        setMockFetchKVGetValue(
+          "some-account-id",
+          "some-namespace-id",
+          "%2Fmy%2Ckey",
+          "my-value"
+        );
+        await runWrangler(
+          "kv:key get /my,key --namespace-id some-namespace-id"
+        );
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
       it("should error if no key is provided", async () => {
         await expect(
           runWrangler("kv:key get")
@@ -945,10 +943,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -956,17 +951,18 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
             -e, --env           Perform on a specific environment  [string]
-                --preview       Interact with a preview namespace  [boolean] [default: false]
-          X [ERROR] Not enough non-option arguments: got 0, need at least 1
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Not enough non-option arguments: got 0, need at least 1
 
           "
         `);
@@ -980,10 +976,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -991,17 +984,18 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
             -e, --env           Perform on a specific environment  [string]
-                --preview       Interact with a preview namespace  [boolean] [default: false]
-          X [ERROR] Exactly one of the arguments binding and namespace-id is required
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Exactly one of the arguments binding and namespace-id is required
 
           "
         `);
@@ -1016,10 +1010,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          "
-        `);
-        expect(std.err).toMatchInlineSnapshot(`
-          "wrangler kv:key get <key>
+          wrangler kv:key get <key>
 
           Reads a single value by key from the given namespace.
 
@@ -1027,17 +1018,18 @@ describe("wrangler", () => {
             key  The key value to get.  [string] [required]
 
           Flags:
-            -c, --config      Path to .toml configuration file  [string]
-            -h, --help        Show help  [boolean]
-            -v, --version     Show version number  [boolean]
-                --legacy-env  Use legacy environments  [boolean]
+            -c, --config   Path to .toml configuration file  [string]
+            -h, --help     Show help  [boolean]
+            -v, --version  Show version number  [boolean]
 
           Options:
                 --binding       The name of the namespace to get from  [string]
                 --namespace-id  The id of the namespace to get from  [string]
             -e, --env           Perform on a specific environment  [string]
-                --preview       Interact with a preview namespace  [boolean] [default: false]
-          X [ERROR] Arguments binding and namespace-id are mutually exclusive
+                --preview       Interact with a preview namespace  [boolean] [default: false]"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Arguments binding and namespace-id are mutually exclusive
 
           "
         `);
@@ -1090,6 +1082,16 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
+      it("should encode the key in the api request to delete a value", async () => {
+        const requests = mockDeleteRequest("voyager", "%2FNCC-74656");
+        await runWrangler(`kv:key delete --namespace-id voyager /NCC-74656`);
+        expect(requests.count).toEqual(1);
+        expect(std.out).toMatchInlineSnapshot(
+          `"Deleting the key \\"/NCC-74656\\" on namespace voyager."`
+        );
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
       it("should delete a key in a namespace specified by binding name", async () => {
         writeWranglerConfig();
         const requests = mockDeleteRequest("bound-id", "someKey");
@@ -1235,7 +1237,25 @@ describe("wrangler", () => {
           "a string",
           { key: "someKey" },
           { value: "someValue" },
+          // add a valid object here to make sure it's not included
+          { key: "someKey1", value: "someValue1" },
+          // this one will only add a warning
           { key: "someKey1", value: "someValue1", invalid: true },
+          // back to the invalid ones
+          { key: 123, value: "somevalue" },
+          { key: "somekey", value: 123 },
+          { key: "someKey1", value: "someValue1", expiration: "string" },
+          { key: "someKey1", value: "someValue1", expiration_ttl: "string" },
+          {
+            key: 123,
+            value: {
+              a: {
+                nested: "object",
+              },
+            },
+          },
+          { key: "someKey1", value: "someValue1", metadata: 123 },
+          { key: "someKey1", value: "someValue1", base64: "string" },
         ];
         writeFileSync("./keys.json", JSON.stringify(keyValues));
         await expect(
@@ -1253,10 +1273,17 @@ describe("wrangler", () => {
                   base64?: boolean;
                 }
 
-                The item at index 0 is type: \\"number\\" - 123
-                The item at index 1 is type: \\"string\\" - \\"a string\\"
+                The item at index 0 is 123
+                The item at index 1 is \\"a string\\"
                 The item at index 2 is {\\"key\\":\\"someKey\\"}
-                The item at index 3 is {\\"value\\":\\"someValue\\"}"
+                The item at index 3 is {\\"value\\":\\"someValue\\"}
+                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
+                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
+                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
+                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
+                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
+                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
+                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
               `);
 
         expect(std.out).toMatchInlineSnapshot(`
@@ -1266,7 +1293,7 @@ describe("wrangler", () => {
         expect(std.warn).toMatchInlineSnapshot(`
           "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
 
-            The item at index 4 contains unexpected properties: [\\"invalid\\"].
+            The item at index 5 contains unexpected properties: [\\"invalid\\"].
 
           "
         `);

package/src/__tests__/pages.test.ts

@@ -1,4 +1,4 @@
-import { writeFileSync } from "node:fs";
+import { mkdirSync, writeFileSync } from "node:fs";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
@@ -24,16 +24,15 @@ describe("pages", () => {
       ⚡️ Configure Cloudflare Pages
 
       Commands:
-        wrangler pages dev [directory] [-- command]  🧑‍💻 Develop your full-stack Pages application locally
-        wrangler pages project                       ⚡️ Interact with your Pages projects
-        wrangler pages deployment                    🚀 Interact with the deployments of a project
-        wrangler pages publish [directory]           🆙 Publish a directory of static assets as a Pages deployment
+        wrangler pages dev [directory] [-- command..]  🧑‍💻 Develop your full-stack Pages application locally
+        wrangler pages project                         ⚡️ Interact with your Pages projects
+        wrangler pages deployment                      🚀 Interact with the deployments of a project
+        wrangler pages publish [directory]             🆙 Publish a directory of static assets as a Pages deployment
 
       Flags:
-        -c, --config      Path to .toml configuration file  [string]
-        -h, --help        Show help  [boolean]
-        -v, --version     Show version number  [boolean]
-            --legacy-env  Use legacy environments  [boolean]
+        -c, --config   Path to .toml configuration file  [string]
+        -h, --help     Show help  [boolean]
+        -v, --version  Show version number  [boolean]
 
       🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
     `);
@@ -261,10 +260,9 @@ describe("pages", () => {
           directory  The directory of static files to upload  [string]
 
         Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]
 
         Options:
               --project-name    The name of the project you want to deploy to  [string]
@@ -325,5 +323,28 @@ describe("pages", () => {
       //   ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
       // `);
     });
+
+    it("should not error when directory names contain periods and houses a extensionless file", async () => {
+      mkdirSync(".well-known");
+      writeFileSync(".well-known/foobar", "foobar");
+
+      setMockResponse(
+        "/accounts/:accountId/pages/projects/foo/file",
+        async () => ({
+          id: "7b764dacfd211bebd8077828a7ddefd7",
+        })
+      );
+
+      setMockResponse(
+        "/accounts/:accountId/pages/projects/foo/deployments",
+        async () => ({
+          url: "https://abcxyz.foo.pages.dev/",
+        })
+      );
+
+      await runWrangler("pages publish . --project-name=foo");
+
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
   });
 });