Remove node references from Talon spoken form reader

packages/common/src/ide/types/FileSystem.types.ts

@@ -24,11 +24,23 @@ export interface FileSystem {
    */
   watchDir(path: string, onDidChange: PathChangeListener): Disposable;
 
+  /**
+   * Reads a file from the file system.
+   * @param path The path to the file to read.
+   * @returns The contents of the file, decoded as UTF-8.
+   */
+  readFile(path: string): Promise<string>;
+
   /**
    * The path to the Cursorless talon state JSON file.
    */
   readonly cursorlessTalonStateJsonPath: string;
 
+  /**
+   * The path to the directory containing the Cursorless talon state JSON file.
+   */
+  readonly cursorlessTalonStateJsonDirPath: string;
+
   /**
    * The path to the Cursorless command history directory.
    */

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts → packages/cursorless-engine/src/TalonSpokenFormsJsonReader.ts

@@ -1,12 +1,9 @@
 import { Disposable, FileSystem, Notifier } from "@cursorless/common";
-import { readFile } from "fs/promises";
-
-import * as path from "path";
 import {
   NeedsInitialTalonUpdateError,
   SpokenFormEntry,
   TalonSpokenForms,
-} from "../scopeProviders/TalonSpokenForms";
+} from "./scopeProviders/TalonSpokenForms";
 
 interface TalonSpokenFormsPayload {
   version: number;
@@ -21,7 +18,7 @@ export class TalonSpokenFormsJsonReader implements TalonSpokenForms {
 
   constructor(private fileSystem: FileSystem) {
     this.disposable = this.fileSystem.watchDir(
-      path.dirname(this.fileSystem.cursorlessTalonStateJsonPath),
+      this.fileSystem.cursorlessTalonStateJsonDirPath,
       () => this.notifier.notifyListeners(),
     );
   }
@@ -37,7 +34,9 @@ export class TalonSpokenFormsJsonReader implements TalonSpokenForms {
     let payload: TalonSpokenFormsPayload;
     try {
       payload = JSON.parse(
-        await readFile(this.fileSystem.cursorlessTalonStateJsonPath, "utf-8"),
+        await this.fileSystem.readFile(
+          this.fileSystem.cursorlessTalonStateJsonPath,
+        ),
       );
     } catch (err) {
       if (isErrnoException(err) && err.code === "ENOENT") {

packages/cursorless-engine/src/cursorlessEngine.ts

@@ -18,7 +18,7 @@ import { StoredTargetMap } from "./core/StoredTargets";
 import { RangeUpdater } from "./core/updateSelections/RangeUpdater";
 import { CustomSpokenFormGeneratorImpl } from "./generateSpokenForm/CustomSpokenFormGeneratorImpl";
 import { LanguageDefinitions } from "./languages/LanguageDefinitions";
-import { TalonSpokenFormsJsonReader } from "./nodeCommon/TalonSpokenFormsJsonReader";
+import { TalonSpokenFormsJsonReader } from "./TalonSpokenFormsJsonReader";
 import { ModifierStageFactoryImpl } from "./processTargets/ModifierStageFactoryImpl";
 import { ScopeHandlerFactoryImpl } from "./processTargets/modifiers/scopeHandlers";
 import { runCommand } from "./runCommand";

packages/cursorless-vscode/src/ide/vscode/VscodeFileSystem.ts

@@ -4,11 +4,13 @@ import {
   PathChangeListener,
   RunMode,
 } from "@cursorless/common";
+import * as fs from "fs/promises";
 import { isAbsolute, join } from "path";
 import * as vscode from "vscode";
 
 export class VscodeFileSystem implements FileSystem {
   public readonly cursorlessTalonStateJsonPath: string;
+  readonly cursorlessTalonStateJsonDirPath: string;
   public readonly cursorlessCommandHistoryDirPath: string;
 
   private decoder = new TextDecoder("utf-8");
@@ -18,7 +20,11 @@ export class VscodeFileSystem implements FileSystem {
     private readonly runMode: RunMode,
     private readonly cursorlessDir: string,
   ) {
-    this.cursorlessTalonStateJsonPath = join(this.cursorlessDir, "state.json");
+    this.cursorlessTalonStateJsonDirPath = this.cursorlessDir;
+    this.cursorlessTalonStateJsonPath = join(
+      this.cursorlessTalonStateJsonDirPath,
+      "state.json",
+    );
     this.cursorlessCommandHistoryDirPath = join(
       this.cursorlessDir,
       "commandHistory",
@@ -90,4 +96,8 @@ export class VscodeFileSystem implements FileSystem {
 
     return watcher;
   }
+
+  public readFile(path: string): Promise<string> {
+    return fs.readFile(path, "utf-8");
+  }
 }