wrangler 0.0.0-e2a26a0 → 0.0.0-e2b7352

package/src/__tests__/logout.test.ts

@@ -2,9 +2,12 @@ import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import fetchMock from "jest-fetch-mock";
-import { initialise } from "../user";
+import {
+  reinitialiseAuthTokens,
+  USER_AUTH_CONFIG_FILE,
+  writeAuthConfigFile,
+} from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { writeUserConfig } from "./helpers/mock-user";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
@@ -14,14 +17,15 @@ describe("wrangler", () => {
 
   describe("logout", () => {
     it("should exit with a message stating the user is not logged in", async () => {
-      await initialise();
       await runWrangler("logout");
       expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
     });
 
     it("should logout user that has been properly logged in", async () => {
-      writeUserConfig("some-oauth-tok", "some-refresh-tok");
-
+      writeAuthConfigFile({
+        oauth_token: "some-oauth-tok",
+        refresh_token: "some-refresh-tok",
+      });
       // Mock out the response for a request to revoke the auth tokens,
       // checking the form of the request is as expected.
       fetchMock.mockResponseOnce(async (req) => {
@@ -30,21 +34,19 @@ describe("wrangler", () => {
         return "";
       });
 
-      await initialise();
+      // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
+      reinitialiseAuthTokens();
       await runWrangler("logout");
 
-      expect(std.out).toMatchInlineSnapshot(`
-        "💁  Wrangler is configured with an OAuth token. The token has been successfully revoked
-        Removing ./home/.wrangler/config/default.toml.. success!"
-      `);
+      expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
 
       // Make sure that we made the request to logout.
       expect(fetchMock).toHaveBeenCalledTimes(1);
 
       // Make sure that logout removed the config file containing the auth tokens.
-      expect(
-        existsSync(path.join(os.homedir(), ".wrangler/config/default.toml"))
-      ).toBe(false);
+      expect(existsSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE))).toBe(
+        false
+      );
     });
   });
 });

package/src/__tests__/package-manager.test.ts

@@ -151,7 +151,7 @@ describe("getPackageManager()", () => {
  * Create a fake yarn binary
  */
 function mockYarn(succeed: boolean): void {
-  let unMock;
+  let unMock: () => void;
   beforeEach(async () => {
     unMock = await mockBinary("yarn", `process.exit(${succeed ? 0 : 1})`);
   });
@@ -162,7 +162,7 @@ function mockYarn(succeed: boolean): void {
  * Create a fake npm binary
  */
 function mockNpm(succeed: boolean): void {
-  let unMock;
+  let unMock: () => void;
   beforeEach(async () => {
     unMock = await mockBinary("npm", `process.exit(${succeed ? 0 : 1})`);
   });

package/src/__tests__/pages.test.ts

@@ -0,0 +1,82 @@
+import { execaSync } from "execa";
+import { getPackageManager } from "../package-manager";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import type { PackageManager } from "../package-manager";
+
+describe("subcommand implicit help ran on imcomplete command execution", () => {
+  let mockPackageManager: PackageManager;
+  runInTempDir();
+
+  beforeEach(() => {
+    mockPackageManager = {
+      cwd: process.cwd(),
+      // @ts-expect-error we're making a fake package manager here
+      type: "mockpm",
+      addDevDeps: jest.fn(),
+      install: jest.fn(),
+    };
+    (getPackageManager as jest.Mock).mockResolvedValue(mockPackageManager);
+  });
+
+  const std = mockConsoleMethods();
+  function endEventLoop() {
+    return new Promise((resolve) => setImmediate(resolve));
+  }
+
+  it("should should display a list of available subcommands, for pages with no subcommand", async () => {
+    await runWrangler("pages");
+    await endEventLoop();
+
+    expect(std.out).toMatchInlineSnapshot(`
+      "wrangler pages
+
+      ⚡️ Configure Cloudflare Pages
+
+      Commands:
+        wrangler pages dev [directory] [-- command]  🧑‍💻 Develop your full-stack Pages application locally
+
+      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]
+
+      🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+    `);
+  });
+});
+
+describe("beta message for subcommands", () => {
+  const isWindows = process.platform === "win32";
+  it("should display for pages:dev", async () => {
+    try {
+      execaSync("npx", ["wrangler", "pages", "dev"], {
+        shell: isWindows,
+        env: { BROWSER: "none", ...process.env },
+      }).stderr;
+    } catch (e: unknown) {
+      expect(e).toMatchInlineSnapshot(`
+        [Error: Command failed with exit code 1: npx wrangler pages dev
+        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+        Must specify a directory of static assets to serve or a command to run.]
+      `);
+    }
+  });
+
+  it("should display for pages:functions", async () => {
+    try {
+      execaSync("npx", ["wrangler", "pages", "functions"], {
+        shell: isWindows,
+        env: { BROWSER: "none", ...process.env },
+      }).stderr;
+    } catch (e: unknown) {
+      expect(e).toMatchInlineSnapshot(`
+          [Error: Command failed with exit code 1: npx wrangler pages functions
+          🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+          Must specify a directory of static assets to serve or a command to run.]
+        `);
+    }
+  });
+});

package/src/__tests__/parse.test.ts

@@ -0,0 +1,322 @@
+import {
+  formatMessage,
+  searchLocation,
+  indexLocation,
+  parseJSON,
+  parseTOML,
+} from "../parse";
+import type { Message } from "../parse";
+
+describe("formatMessage", () => {
+  const format = (input: Message) => {
+    // No color and skip emojis at the start.
+    return formatMessage(input, false).substring(2);
+  };
+
+  it("should format message without location", () => {
+    expect(
+      format({
+        text: "Invalid argument",
+        kind: "warning",
+      })
+    ).toMatchInlineSnapshot(`
+      "[WARNING] Invalid argument
+
+      "
+    `);
+  });
+
+  it("should format message with location", () => {
+    expect(
+      format({
+        text: "Missing property: main",
+        location: {
+          line: 1,
+          column: 0,
+          lineText: "{}",
+          file: "package.json",
+          fileText: "{}",
+        },
+      })
+    ).toMatchInlineSnapshot(`
+      "[ERROR] Missing property: main
+
+          package.json:1:0:
+            1 │ {}
+              ╵ ^
+
+      "
+    `);
+  });
+
+  it("should format message with location and notes", () => {
+    expect(
+      format({
+        text: "Invalid property: type",
+        location: {
+          line: 3,
+          column: 8,
+          length: 7,
+          lineText: "type = 'modular'",
+          suggestion: "Did you mean 'module'?",
+          file: "package.toml",
+          fileText: "[package]\ntype = 'modular'\n",
+        },
+        notes: [
+          {
+            text: "There are two acceptable types: 'module' and 'commonjs'",
+          },
+        ],
+      })
+    ).toMatchInlineSnapshot(`
+      "[ERROR] Invalid property: type
+
+          package.toml:3:8:
+            3 │ type = 'modular'
+              │         ~~~~~~~
+              ╵         Did you mean 'module'?
+
+        There are two acceptable types: 'module' and 'commonjs'
+
+      "
+    `);
+  });
+});
+
+describe("parseTOML", () => {
+  it("should parse toml that is empty", () => {
+    expect(parseTOML("")).toStrictEqual({});
+  });
+
+  it("should parse toml with basic values", () => {
+    expect(
+      parseTOML(`
+        name = "basic"
+        version = 1
+    `)
+    ).toStrictEqual({
+      name: "basic",
+      version: 1,
+    });
+  });
+
+  it("should parse toml with complex values", () => {
+    expect(
+      parseTOML(`
+        name = 'complex'
+        version = 1
+        [owner]
+        name = ["tim"]
+        alive = true
+        [owner.dog]
+        exists = true
+      `)
+    ).toStrictEqual({
+      name: "complex",
+      owner: {
+        alive: true,
+        dog: {
+          exists: true,
+        },
+        name: ["tim"],
+      },
+      version: 1,
+    });
+  });
+
+  it("should fail to parse toml with invalid string", () => {
+    try {
+      parseTOML(`name = 'fail"`);
+      fail("parseTOML did not throw");
+    } catch (err) {
+      expect({ ...(err as Error) }).toStrictEqual({
+        name: "ParseError",
+        text: "Unterminated string",
+        kind: "error",
+        location: {
+          line: 1,
+          column: 14,
+          fileText: "name = 'fail\"",
+          file: undefined,
+          lineText: "name = 'fail\"",
+        },
+        notes: [],
+      });
+    }
+  });
+
+  it("should fail to parse toml with invalid header", () => {
+    try {
+      parseTOML(`\n[name`, "config.toml");
+      fail("parseTOML did not throw");
+    } catch (err) {
+      expect({ ...(err as Error) }).toStrictEqual({
+        name: "ParseError",
+        text: "Key ended without value",
+        kind: "error",
+        location: {
+          line: 2,
+          column: 5,
+          lineText: "[name",
+          file: "config.toml",
+          fileText: "\n[name",
+        },
+        notes: [],
+      });
+    }
+  });
+});
+
+describe("parseJSON", () => {
+  it("should parse json that is empty", () => {
+    expect(parseJSON("{}")).toStrictEqual({});
+  });
+
+  it("should parse json with basic values", () => {
+    expect(
+      parseJSON(`
+      {
+        "name" : "basic",
+        "version": 1
+      }`)
+    ).toStrictEqual({
+      name: "basic",
+      version: 1,
+    });
+  });
+
+  it("should parse json with complex values", () => {
+    expect(
+      parseJSON(
+        `{
+          "name":"complex",
+          "spec":{
+            "uptime":[1,2.5,3],
+            "ok":true
+          }
+        }`
+      )
+    ).toStrictEqual({
+      name: "complex",
+      spec: {
+        uptime: [1, 2.5, 3],
+        ok: true,
+      },
+    });
+  });
+
+  it("should fail to parse json with invalid string", () => {
+    try {
+      parseJSON(`\n{\n"version" "1\n}\n`);
+      fail("parseJSON did not throw");
+    } catch (err) {
+      expect({ ...(err as Error) }).toStrictEqual({
+        name: "ParseError",
+        text: "Unexpected string",
+        kind: "error",
+        location: {
+          line: 3,
+          column: 9,
+          lineText: '"version" "1',
+          file: undefined,
+          fileText: `\n{\n"version" "1\n}\n`,
+        },
+        notes: [],
+      });
+    }
+  });
+
+  it("should fail to parse json with invalid number", () => {
+    const file = "config.json",
+      fileText = `{\n\t"a":{\n\t\t"b":{\n\t\t\t"c":[012345]\n}\n}\n}`;
+    try {
+      parseJSON(fileText, file);
+      fail("parseJSON did not throw");
+    } catch (err) {
+      expect({ ...(err as Error) }).toStrictEqual({
+        name: "ParseError",
+        text: "Unexpected number",
+        kind: "error",
+        location: {
+          file,
+          fileText,
+          line: 4,
+          column: 8,
+          lineText: `\t\t\t"c":[012345]`,
+        },
+        notes: [],
+      });
+    }
+  });
+});
+
+describe("indexLocation", () => {
+  it("should calculate location from one-line input", () => {
+    const fileText = "";
+    expect(indexLocation({ fileText }, 1)).toStrictEqual({
+      fileText,
+      line: 1,
+      column: 0,
+      lineText: "",
+    });
+  });
+
+  it("should calculate location from multi-line input", () => {
+    const file = "package.json",
+      fileText = `\n{\n\t"hello":"world"\n}\n`;
+    expect(indexLocation({ file, fileText }, 11)).toStrictEqual({
+      file,
+      fileText,
+      line: 3,
+      column: 7,
+      lineText: `\t"hello":"world"`,
+    });
+  });
+
+  it("should calculate location when index is out of bounds", () => {
+    const fileText = `\n\n\n\n`;
+    expect(indexLocation({ fileText }, 10)).toStrictEqual({
+      fileText,
+      line: 5,
+      column: 0,
+      lineText: undefined,
+    });
+  });
+});
+
+describe("searchLocation", () => {
+  it("should calculate location from one-line match", () => {
+    const file = "config.toml",
+      fileText = `name = 'coolthing'`;
+    expect(searchLocation({ file, fileText }, "coolthing")).toStrictEqual({
+      file,
+      fileText,
+      line: 1,
+      column: 8,
+      length: 9,
+      lineText: `name = 'coolthing'`,
+    });
+  });
+
+  it("should calculate location from multi-line match", () => {
+    const fileText = `\n{"versions":[\n\t"1.2.3",\n\t"1.2.4",\n\t"1.2.5"\n]}\n`;
+    expect(searchLocation({ fileText }, "1.2.4")).toStrictEqual({
+      fileText,
+      line: 4,
+      column: 2,
+      length: 5,
+      lineText: `\t"1.2.4",`,
+    });
+  });
+
+  it("should calculate location from no match", () => {
+    const fileText = `\n{}\n`;
+    expect(searchLocation({ fileText }, "apple")).toStrictEqual({
+      fileText,
+      line: 3,
+      column: 0,
+      length: undefined,
+      lineText: undefined,
+    });
+  });
+});