vscode-apollo 1.19.3 → 2.0.0

package/src/__e2e__/run.js

@@ -0,0 +1,23 @@
+const path = require("path");
+const { runCLI } = require("@jest/core");
+const yargs = require("yargs");
+const { yargsOptions } = require("jest-cli");
+
+async function run() {
+  const root = path.join(__dirname, "..", "..");
+  const argv = await yargs(JSON.parse(process.env.TEST_ARGV || "[]").slice(2))
+    .alias("help", "h")
+    .options(yargsOptions).argv;
+
+  const results = await runCLI(
+    {
+      ...argv,
+      config: path.join(root, "jest.e2e.config.js"),
+      runInBand: true,
+    },
+    [root],
+  );
+  process.exit(results.results.numFailedTests);
+}
+
+module.exports.run = run;

package/src/__e2e__/runTests.js

@@ -0,0 +1,44 @@
+// @ts-check
+const path = require("path");
+const { runTests } = require("@vscode/test-electron");
+const { runMockServer } = require("./mockServer.js");
+const { loadDefaultMocks } = require("./mocks.js");
+
+async function main() {
+  let disposable;
+  try {
+    // The folder containing the Extension Manifest package.json
+    // Passed to `--extensionDevelopmentPath`
+    const extensionDevelopmentPath = path.resolve(__dirname, "../../");
+    // The path to the extension test runner script
+    // Passed to --extensionTestsPath
+    const extensionTestsPath = path.resolve(__dirname, "./run.js");
+    process.env.TEST_ARGV = JSON.stringify(process.argv);
+
+    const TEST_PORT = 7096;
+    process.env.APOLLO_ENGINE_ENDPOINT = "http://localhost:7096/apollo";
+    process.env.MOCK_SERVER_PORT = String(TEST_PORT);
+    disposable = runMockServer(TEST_PORT);
+    await loadDefaultMocks(TEST_PORT);
+    // Download VS Code, unzip it and run the integration test
+    const exitCode = await runTests({
+      extensionDevelopmentPath,
+      extensionTestsPath,
+      launchArgs: [
+        "--disable-extensions",
+        `${extensionDevelopmentPath}/sampleWorkspace/sampleWorkspace.code-workspace`,
+      ],
+    });
+    process.exit(exitCode);
+  } catch (err) {
+    console.error(err);
+    console.error("Failed to run tests");
+    process.exit(1);
+  } finally {
+    if (disposable) {
+      disposable[Symbol.dispose]();
+    }
+  }
+}
+
+main();

package/src/__e2e__/setup.js

@@ -0,0 +1 @@
+jest.setTimeout(10000);

package/src/__e2e__/vscode-environment.js

@@ -0,0 +1,16 @@
+const { TestEnvironment } = require("jest-environment-node");
+const vscode = require("vscode");
+
+class VsCodeEnvironment extends TestEnvironment {
+  async setup() {
+    await super.setup();
+    this.global.vscode = vscode;
+  }
+
+  async teardown() {
+    this.global.vscode = {};
+    await super.teardown();
+  }
+}
+
+module.exports = VsCodeEnvironment;

package/src/__e2e__/vscode.js

@@ -0,0 +1 @@
+module.exports = global.vscode;

package/src/__mocks__/fs.js

@@ -0,0 +1,3 @@
+const { fs } = require("memfs");
+
+module.exports = fs;

package/src/__tests__/statusBar.test.ts

@@ -1,11 +1,12 @@
-import StatusBar from "../statusBar";
+// import StatusBar from "../statusBar";
 
-describe("statusBar", () => {
+// TODO (jgzuke) disable this until we migrate away from `vscode`.
+// https://code.visualstudio.com/api/working-with-extensions/testing-extension#migrating-from-vscode
+describe.skip("statusBar", () => {
   it("only shows loaded state when it's supposed to", () => {
-    const statusBar = new StatusBar({ hasActiveTextEditor: true });
-
-    expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadingStateText);
-    statusBar.showLoadedState({ hasActiveTextEditor: true });
-    expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadedStateText);
+    // const statusBar = new StatusBar({ hasActiveTextEditor: true });
+    // expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadingStateText);
+    // statusBar.showLoadedState({ hasActiveTextEditor: true });
+    // expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadedStateText);
   });
 });

package/src/build.js

@@ -0,0 +1,57 @@
+const esbuild = require("esbuild");
+
+const production = process.argv.includes("--production");
+const watch = process.argv.includes("--watch");
+
+async function main() {
+  const ctx = await esbuild.context({
+    entryPoints: ["src/extension.ts", "src/language-server/server.ts"],
+    bundle: true,
+    format: "cjs",
+    minify: production,
+    keepNames: true,
+    sourcemap: !production,
+    sourcesContent: false,
+    platform: "node",
+    outdir: "lib",
+    external: ["vscode"],
+    logLevel: "silent",
+    plugins: [
+      /* add to the end of plugins array */
+      esbuildProblemMatcherPlugin,
+    ],
+  });
+  if (watch) {
+    await ctx.watch();
+  } else {
+    await ctx.rebuild();
+    await ctx.dispose();
+  }
+}
+
+/**
+ * @type {import('esbuild').Plugin}
+ */
+const esbuildProblemMatcherPlugin = {
+  name: "esbuild-problem-matcher",
+
+  setup(build) {
+    build.onStart(() => {
+      console.log("[watch] build started");
+    });
+    build.onEnd((result) => {
+      result.errors.forEach(({ text, location }) => {
+        console.error(`✘ [ERROR] ${text}`);
+        console.error(
+          `    ${location.file}:${location.line}:${location.column}:`,
+        );
+      });
+      console.log("[watch] build finished");
+    });
+  },
+};
+
+main().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});

package/src/debug.ts

@@ -1,4 +1,4 @@
-import { window, workspace, OutputChannel } from "vscode";
+import { OutputChannel } from "vscode";
 
 /**
  * for errors (and other logs in debug mode) we want to print
@@ -10,10 +10,7 @@ const createAndTrimStackTrace = () => {
   let stack: string | undefined = new Error().stack;
   // remove the lines in the stack from _this_ function and the caller (in this file) and shorten the trace
   return stack && stack.split("\n").length > 2
-    ? stack
-        .split("\n")
-        .slice(3, 7)
-        .join("\n")
+    ? stack.split("\n").slice(3, 7).join("\n")
     : stack;
 };
 

package/src/env/index.ts

@@ -0,0 +1 @@
+export * from "./typescript-utility-types";

package/src/env/typescript-utility-types.ts

@@ -0,0 +1,2 @@
+export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+export type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]> };