Allow absolute paths for subgraphs

dowjones · Oct 14, 2023 · 51b7d8a · 51b7d8a
1 parent f6c79da
commit 51b7d8a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/src/Subgraph.ts b/src/Subgraph.ts
@@ -254,7 +254,7 @@ export class Subgraph extends vscode.TreeItem {
         type: 'node',
         request: 'launch',
         name: this.label,
-        program: '${workspaceRoot}' + `/${this.filePath}/server.js`,
+        program: `${this.filePath}/server.js`,
         skipFiles: ['<node_internals>/**'],
         // eslint-disable-next-line @typescript-eslint/naming-convention
         env: { NODE_ENV: 'local' },

diff --git a/src/setup.ts b/src/setup.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { commands, window, workspace } from 'vscode';
 import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import { isAbsolute, join } from 'path';
 import axios from 'axios';
 
 export const sampleSupergraphJson = {
@@ -38,24 +39,35 @@ export const generateTemplate = (rootPath: string) => {
     mkdirSync(rootPath + '/.vscode');
   }
   if (!existsSync(rootPath + '/.rover-runner/supergraph.json')) {
-    writeFileSync(`${rootPath}/.rover-runner/supergraph.json`, JSON.stringify(sampleSupergraphJson, null, 2), 'utf-8');
+    writeFileSync(
+      `${rootPath}/.rover-runner/supergraph.json`,
+      JSON.stringify(sampleSupergraphJson, null, 2),
+      'utf-8'
+    );
     commands.executeCommand('subgraphsList.refreshEntry');
   }
 };
 
 export const isApolloConfigured = () => {
   if (
-    workspace.getConfiguration().get('apolloStudioConfiguration.apolloKey', '').length > 0 &&
-    workspace.getConfiguration().get('apolloStudioConfiguration.apolloGraphRef', '').length > 0
+    workspace.getConfiguration().get('apolloStudioConfiguration.apolloKey', '')
+      .length > 0 &&
+    workspace
+      .getConfiguration()
+      .get('apolloStudioConfiguration.apolloGraphRef', '').length > 0
   ) {
     return true;
   }
   return false;
 };
 
 export const fetchSubgraphUrls = async () => {
-  let apolloKey = workspace.getConfiguration().get('apolloStudioConfiguration.apolloKey', '');
-  let graphRef = workspace.getConfiguration().get('apolloStudioConfiguration.apolloGraphRef', '');
+  let apolloKey = workspace
+    .getConfiguration()
+    .get('apolloStudioConfiguration.apolloKey', '');
+  let graphRef = workspace
+    .getConfiguration()
+    .get('apolloStudioConfiguration.apolloGraphRef', '');
   let body = {
     operationName: 'GetSubgraphUrls',
     query:
@@ -91,3 +103,13 @@ export const fetchSubgraphUrls = async () => {
       return {};
     });
 };
+
+export const makePathAbsolute = (filePath: string, configPath: string) => {
+  // If absolute or empty path, then return
+  if (isAbsolute(filePath) || filePath.length === 0) {
+    return filePath;
+  }
+  // Convert relative path to be absolute
+  const workspaceRoot = configPath.split('.rover-runner')[0];
+  return join(workspaceRoot, filePath);
+};
diff --git a/src/supergraph.ts b/src/supergraph.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { setTimeout } from 'timers/promises';
-import { fetchSubgraphUrls } from './setup';
+import { fetchSubgraphUrls, makePathAbsolute } from './setup';
 import { ExtensionContext, TreeItem, TreeItemCollapsibleState, window, workspace } from 'vscode';
 import { SupergraphYaml, writeSupergraphYaml } from './supergraphYaml';
 import { Subgraph } from './Subgraph';
@@ -35,14 +35,15 @@ export class Supergraph extends TreeItem {
       const current = context.workspaceState.get(subgraphName + 'currentUrl', 'devUrl');
       // Can either be Stopped or Running
       const contextValue = context.workspaceState.get(subgraphName, 'StoppedSubgraph');
+      const filePath = makePathAbsolute(subgraphConfig.path, configPath);
       return [
         new Subgraph(
           subgraphName,
           current,
           subgraphConfig.localUrl,
           usedDevUrl,
           contextValue,
-          subgraphConfig.path,
+          filePath,
           TreeItemCollapsibleState.None
         ),
       ];