Update extension to support latest version of CLI

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

vs/client/package-lock.json

@@ -3,8 +3,8 @@
 import { Targets, allExtensions } from "@ibm/sourceorbit";
 import { ILEObject } from "@ibm/sourceorbit/dist/src/targets";
 
-import glob from "glob";
 import { URI } from 'vscode-uri';
+import { ReadFileSystem } from './readFileSystem';
 
 import path = require("path");
 
@@ -44,9 +44,10 @@ export class TargetsManager {
     const uri = URI.parse(workspaceUri);
     const url = uri.fsPath;
 
-    const files = getFiles(url, SupportedGlob);
+    const rfs = new ReadFileSystem();
+    const files = await rfs.getFiles(url, SupportedGlob);
 
-    const targets = new Targets(url);
+    const targets = new Targets(url, rfs);
 
     targets.loadObjectsFromPaths(files);
 
@@ -151,12 +152,4 @@ export class TargetsManager {
 
     return [];
   }
-}
-
-export function getFiles(cwd: string, globPath: string): string[] {
-  return glob.sync(globPath, {
-    cwd,
-    absolute: true,
-    nocase: true,
-  });
 }

vs/package-lock.json

@@ -0,0 +1,21 @@
+import ffs from 'fs';
+import fs from 'fs/promises';
+import { glob } from 'glob';
+
+export class ReadFileSystem {
+  async getFiles(cwd: string, globPath: string): Promise<string[]> {
+    return glob.sync(globPath, {
+      cwd,
+      absolute: true,
+      nocase: true,
+    });
+  }
+
+  readFile(filePath: string): Promise<string> {
+    return fs.readFile(filePath, { encoding: `utf8` });
+  }
+
+  async exists(filePath: string): Promise<boolean> {
+    return ffs.existsSync(filePath);
+  }
+}

vs/server/package-lock.json

@@ -4,8 +4,9 @@ import { TargetSuggestions } from '@ibm/sourceorbit/dist/src/targets';
 import fs from 'fs';
 import path from 'path';
 import { URI } from 'vscode-uri';
+import { ReadFileSystem } from './readFileSystem';
 import { connection } from './server';
-import { SupportedGlob, TargetsManager, getFiles } from './TargetsManager';
+import { SupportedGlob, TargetsManager } from './TargetsManager';
 
 export async function initAndRefresh(workspaceUri: string) {
 	const progress = await connection.window.createWorkDoneProgress();
@@ -84,9 +85,11 @@ export async function fixProject(workspaceUri: string, suggestions: TargetSugges
 	const progress = await connection.window.createWorkDoneProgress();
 
 	progress.begin(`Source Orbit`, undefined, `Fetching files..`);
-	const files = getFiles(url, SupportedGlob);
+	
+	const rfs = new ReadFileSystem();
+	const files = await rfs.getFiles(url, SupportedGlob);
 
-	const targets = new Targets(url);
+	const targets = new Targets(url, rfs);
 	targets.setSuggestions(suggestions);
 
 	progress.report(`Loading files..`);