vscode-apollo 2.0.0 → 2.0.1

package/.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 executors:
   node:
     docker:
-      - image: cimg/node:22.5.1
+      - image: cimg/node:22.6.0
     working_directory: ~/vscode-graphql
 
 commands:

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.0.1
+
+### Patch Changes
+
+- [#171](https://github.com/apollographql/vscode-graphql/pull/171) [`37a2b292`](https://github.com/apollographql/vscode-graphql/commit/37a2b292c0de22ee76645fc2dcde03b8f4843051) Thanks [@phryneas](https://github.com/phryneas)! - Also try parsing `.ts` files as CommonJS, not only ESM.
+
 ## 2.0.0
 
 ### Major Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",

package/src/language-server/config/__tests__/loadConfig.ts

@@ -158,6 +158,30 @@ Object {
       const config = await loadConfig({ configPath: dirPath });
       expect(config?.client?.service).toEqual("hello");
     });
+
+    it("loads config from a ts file with CommonJs", async () => {
+      writeFilesToDir(dir, {
+        "apollo.config.ts": `module.exports = {"client": {"service": "hello"} }`,
+      });
+      const config = await loadConfig({ configPath: dirPath });
+      expect(config?.client?.service).toEqual("hello");
+    });
+
+    it("loads config from a cjs file", async () => {
+      writeFilesToDir(dir, {
+        "apollo.config.cjs": `module.exports = {"client": {"service": "hello"} }`,
+      });
+      const config = await loadConfig({ configPath: dirPath });
+      expect(config?.client?.service).toEqual("hello");
+    });
+
+    it("loads config from a mjs file", async () => {
+      writeFilesToDir(dir, {
+        "apollo.config.mjs": `export default {"client": {"service": "hello"} }`,
+      });
+      const config = await loadConfig({ configPath: dirPath });
+      expect(config?.client?.service).toEqual("hello");
+    });
   });
 
   describe("errors", () => {

package/src/language-server/config/loadConfig.ts

@@ -1,4 +1,4 @@
-import { cosmiconfig } from "cosmiconfig";
+import { cosmiconfig, defaultLoaders } from "cosmiconfig";
 import { resolve } from "path";
 import { readFileSync, existsSync, lstatSync } from "fs";
 import {
@@ -9,6 +9,7 @@ import {
 import { getServiceFromKey } from "./utils";
 import { URI } from "vscode-uri";
 import { Debug } from "../utilities";
+import { loadTs } from "./loadTsConfig";
 
 // config settings
 const MODULE_NAME = "apollo";
@@ -37,11 +38,16 @@ export type ConfigResult<T> = {
 } | null;
 
 // XXX load .env files automatically
+
 export async function loadConfig({
   configPath,
 }: LoadConfigSettings): Promise<ApolloConfig | null> {
   const explorer = cosmiconfig(MODULE_NAME, {
     searchPlaces: defaultFileNames,
+    loaders: {
+      ...defaultLoaders,
+      [".ts"]: loadTs,
+    },
   });
 
   // search can fail if a file can't be parsed (ex: a nonsense js file) so we wrap in a try/catch

package/src/language-server/config/loadTsConfig.ts

@@ -0,0 +1,70 @@
+import { Loader, defaultLoaders } from "cosmiconfig";
+import { dirname } from "node:path";
+import { rm, writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+
+// implementation based on https://github.com/cosmiconfig/cosmiconfig/blob/a5a842547c13392ebb89a485b9e56d9f37e3cbd3/src/loaders.ts
+// Copyright (c) 2015 David Clark licensed MIT. Full license can be found here:
+// https://github.com/cosmiconfig/cosmiconfig/blob/a5a842547c13392ebb89a485b9e56d9f37e3cbd3/LICENSE
+
+let typescript: typeof import("typescript");
+export const loadTs: Loader = async function loadTs(filepath, content) {
+  try {
+    return await defaultLoaders[".ts"](filepath, content);
+  } catch (error) {
+    if (
+      !(error instanceof Error) ||
+      !error.message.includes("module is not defined")
+    )
+      throw error;
+  }
+
+  if (typescript === undefined) {
+    typescript = await import("typescript");
+  }
+  const compiledFilepath = `${filepath.slice(0, -2)}cjs`;
+  let transpiledContent;
+  try {
+    try {
+      const config = resolveTsConfig(dirname(filepath)) ?? {};
+      config.compilerOptions = {
+        ...config.compilerOptions,
+        module: typescript.ModuleKind.CommonJS,
+        moduleResolution: typescript.ModuleResolutionKind.Bundler,
+        target: typescript.ScriptTarget.ES2022,
+        noEmit: false,
+      };
+      transpiledContent = typescript.transpileModule(
+        content,
+        config,
+      ).outputText;
+      await writeFile(compiledFilepath, transpiledContent);
+    } catch (error: any) {
+      error.message = `TypeScript Error in ${filepath}:\n${error.message}`;
+      throw error;
+    }
+    // eslint-disable-next-line @typescript-eslint/return-await
+    return await defaultLoaders[".js"](compiledFilepath, transpiledContent);
+  } finally {
+    if (existsSync(compiledFilepath)) {
+      await rm(compiledFilepath);
+    }
+  }
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function resolveTsConfig(directory: string): any {
+  const filePath = typescript.findConfigFile(directory, (fileName) => {
+    return typescript.sys.fileExists(fileName);
+  });
+  if (filePath !== undefined) {
+    const { config, error } = typescript.readConfigFile(filePath, (path) =>
+      typescript.sys.readFile(path),
+    );
+    if (error) {
+      throw new Error(`Error in ${filePath}: ${error.messageText.toString()}`);
+    }
+    return config;
+  }
+  return;
+}