vscode-apollo 2.2.1 → 2.3.1

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

@@ -1,56 +1,78 @@
-import { Loader, defaultLoaders } from "cosmiconfig";
+import { Loader } from "cosmiconfig";
 import { dirname } from "node:path";
-import { rm, writeFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
-
+import typescript from "typescript";
+import { pathToFileURL } from "node:url";
+import { register } from "node:module";
+import { ImportAttributes } from "./cache-busting-resolver.types";
 // 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");
+if (process.env.JEST_WORKER_ID === undefined) {
+  register(
+    pathToFileURL(require.resolve("./config/cache-busting-resolver.js")),
+  );
+} else {
+  register(pathToFileURL(require.resolve("./cache-busting-resolver.js")));
+}
+
 export const loadTs: Loader = async function loadTs(filepath, content) {
   try {
-    return await defaultLoaders[".ts"](filepath, content);
+    return await load(filepath, content, "module", {
+      module: typescript.ModuleKind.ES2022,
+    });
   } catch (error) {
     if (
-      !(error instanceof Error) ||
-      !error.message.includes("module is not defined")
-    )
+      error instanceof Error &&
+      // [ERROR] ReferenceError: module is not defined in ES module scope
+      error.message.includes("module is not defined")
+    ) {
+      return await load(filepath, content, "commonjs", {
+        module: typescript.ModuleKind.CommonJS,
+      });
+    } else {
       throw error;
+    }
   }
+};
 
-  if (typescript === undefined) {
-    typescript = await import("typescript");
-  }
-  const compiledFilepath = `${filepath.slice(0, -2)}cjs`;
+async function load(
+  filepath: string,
+  content: string,
+  type: "module" | "commonjs",
+  compilerOptions: Partial<import("typescript").CompilerOptions>,
+) {
   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);
-    }
+    const config = resolveTsConfig(dirname(filepath)) ?? {};
+    config.compilerOptions = {
+      ...config.compilerOptions,
+
+      moduleResolution: typescript.ModuleResolutionKind.Bundler,
+      target: typescript.ScriptTarget.ES2022,
+      noEmit: false,
+      ...compilerOptions,
+    };
+    transpiledContent = typescript.transpileModule(content, config).outputText;
+  } catch (error: any) {
+    error.message = `TypeScript Error in ${filepath}:\n${error.message}`;
+    throw error;
   }
-};
+  // eslint-disable-next-line @typescript-eslint/return-await
+  const imported = await import(
+    filepath,
+    //@ts-ignore
+    {
+      with: {
+        as: "cachebust",
+        contents: transpiledContent,
+        format: type,
+      } satisfies ImportAttributes,
+    }
+  );
+  return imported.default;
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function resolveTsConfig(directory: string): any {
@@ -68,3 +90,17 @@ function resolveTsConfig(directory: string): any {
   }
   return;
 }
+
+export const loadJs: Loader = async function loadJs(filepath, contents) {
+  return (
+    await import(
+      filepath, // @ts-ignore
+      {
+        with: {
+          as: "cachebust",
+          contents,
+        } satisfies ImportAttributes,
+      }
+    )
+  ).default;
+};

package/src/language-server/project/base.ts

@@ -18,7 +18,13 @@ import { TextDocument } from "vscode-languageserver-textdocument";
 
 import type { LoadingHandler } from "../loadingHandler";
 import { FileSet } from "../fileSet";
-import { ApolloConfig, ClientConfig, RoverConfig } from "../config";
+import {
+  ApolloConfig,
+  ClientConfig,
+  envFileNames,
+  RoverConfig,
+  supportedConfigFileNames,
+} from "../config";
 import type { ProjectStats } from "../../messages";
 
 export type DocumentUri = string;
@@ -67,13 +73,7 @@ export abstract class GraphQLProject {
 
     this.configFileSet = new FileSet({
       rootURI: this.rootURI,
-      includes: [
-        ".env",
-        "apollo.config.js",
-        "apollo.config.cjs",
-        "apollo.config.mjs",
-        "apollo.config.ts",
-      ],
+      includes: supportedConfigFileNames.concat(envFileNames),
       excludes: [],
     });
 

package/src/language-server/project/rover/project.ts

@@ -24,6 +24,7 @@ import {
   SemanticTokensRegistrationType,
   SemanticTokensOptions,
   SemanticTokensRegistrationOptions,
+  DefinitionRequest,
 } from "vscode-languageserver/node";
 import cp from "node:child_process";
 import { GraphQLProjectConfig } from "../base";
@@ -281,6 +282,11 @@ export class RoverProject extends GraphQLProject {
       this.sendRequest(HoverRequest.type, virtualParams, token),
     );
 
+  onDefinition: GraphQLProject["onDefinition"] = async (params, token) =>
+    this.documents.insideVirtualDocument(params, (virtualParams) =>
+      this.sendRequest(DefinitionRequest.type, virtualParams, token),
+    );
+
   onUnhandledRequest: GraphQLProject["onUnhandledRequest"] = async (
     type,
     params,

package/src/language-server/server.ts

@@ -9,7 +9,8 @@ import {
   FileEvent,
 } from "vscode-languageserver/node";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import type { QuickPickItem } from "vscode";
+import { type QuickPickItem } from "vscode";
+import { basename } from "node:path";
 import { GraphQLWorkspace } from "./workspace";
 import { LanguageServerLoadingHandler } from "./loadingHandler";
 import { debounceHandler, Debug } from "./utilities";
@@ -23,6 +24,7 @@ import { isValidationError } from "zod-validation-error";
 import { GraphQLProject } from "./project/base";
 import type { LanguageIdExtensionMap } from "../tools/utilities/languageInformation";
 import { setLanguageIdExtensionMap } from "./utilities/languageIdForExtension";
+import { envFileNames, supportedConfigFileNames } from "./config";
 
 export type InitializationOptions = {
   languageIdExtensionMap: LanguageIdExtensionMap;
@@ -190,14 +192,13 @@ documents.onDidClose(
 connection.onDidChangeWatchedFiles((params) => {
   const handledByProject = new Map<GraphQLProject, FileEvent[]>();
   for (const { uri, type } of params.changes) {
+    const fsPath = URI.parse(uri).fsPath;
+    const fileName = basename(fsPath);
     if (
-      uri.endsWith("apollo.config.js") ||
-      uri.endsWith("apollo.config.cjs") ||
-      uri.endsWith("apollo.config.mjs") ||
-      uri.endsWith("apollo.config.ts") ||
-      uri.endsWith(".env")
+      supportedConfigFileNames.includes(fileName) ||
+      envFileNames.includes(fileName)
     ) {
-      workspace.reloadProjectForConfig(uri);
+      workspace.reloadProjectForConfigOrCompanionFile(uri);
     }
 
     // Don't respond to changes in files that are currently open,

package/src/language-server/workspace.ts

@@ -125,7 +125,7 @@ export class GraphQLWorkspace {
 
     */
     const apolloConfigFiles: string[] = globSync(
-      "**/apollo.config.@(js|ts|cjs|mjs)",
+      "**/apollo.config.@(js|ts|cjs|mjs|yaml|yml|json)",
       {
         cwd: URI.parse(folder.uri).fsPath,
         absolute: true,
@@ -197,7 +197,7 @@ export class GraphQLWorkspace {
     });
   }
 
-  async reloadProjectForConfig(configUri: DocumentUri) {
+  async reloadProjectForConfigOrCompanionFile(configUri: DocumentUri) {
     const configPath = dirname(URI.parse(configUri).fsPath);
     let config: ApolloConfig | null;
     let error;
@@ -215,9 +215,6 @@ export class GraphQLWorkspace {
     }
     // If project exists, update the config
     if (project && config) {
-      if (equal(project.config.rawConfig, config.rawConfig)) {
-        return;
-      }
       await Promise.all(project.updateConfig(config));
       this.reloadService();
     }

package/src/languageServerClient.ts

@@ -52,7 +52,9 @@ export function getLanguageServerClient(
     documentSelector: supportedLanguageIds,
     synchronize: {
       fileEvents: [
-        workspace.createFileSystemWatcher("**/.env?(.local)"),
+        workspace.createFileSystemWatcher(
+          "**/{.env?(.local),apollo.config.{json,yml,yaml}}",
+        ),
         workspace.createFileSystemWatcher(
           "**/*{" + supportedExtensions.join(",") + "}",
         ),

package/sampleWorkspace/localSchemaArray/apollo.config.js

@@ -1,12 +0,0 @@
-module.exports = {
-  client: {
-    service: {
-      name: "localMultiSchema",
-      localSchemaFile: [
-        "./starwarsSchema.graphql",
-        // this documents an unfixed bug: in this multi-folder-workspace, this looks for files relative to the first folder in the .code-workspace file
-        "./planets.graphql",
-      ],
-    },
-  },
-};

package/sampleWorkspace/rover/apollo.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  rover: {},
-};