feat(vscode): support workspaces and monorepo

Author: claneo

.vscode/launch.json

@@ -15,7 +15,7 @@
         "${workspaceFolder}/packages/vscode/sample"
       ],
       "outFiles": ["${workspaceFolder}/packages/vscode/dist/**/*.js"],
-      "preLaunchTask": "npm: build:local",
+      "preLaunchTask": "npm: watch:local",
       "autoAttachChildProcesses": true
     }
   ]

.vscode/settings.json

@@ -14,6 +14,7 @@
     "**/.DS_Store": true
   },
   "editor.codeActionsOnSave": {
+    "source.organizeImports": "never",
     "source.organizeImports.biome": "explicit"
   },
   "[javascript]": {

.vscode/tasks.json

@@ -5,7 +5,7 @@
   "tasks": [
     {
       "type": "npm",
-      "script": "build:local",
+      "script": "watch:local",
       "path": "packages/vscode",
       "problemMatcher": "$tsc-watch",
       "isBackground": true,

packages/vscode/package.json

@@ -45,6 +45,16 @@
           "markdownDescription": "The path to a `package.json` file of a Rstest executable (it's usually inside `node_modules`) in case the extension cannot find it. It will be used to resolve Rstest API paths. This should be used as a last resort fix. Supports `${workspaceFolder}` placeholder.",
           "scope": "resource",
           "type": "string"
+        },
+        "rstest.configFileGlobPattern": {
+          "description": "Glob patterns used to discover config fiels. Must be an array of strings.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [
+            "**/rstest.config.{mjs,ts,js,cjs,mts,cts}"
+          ]
         }
       }
     }
@@ -59,6 +69,7 @@
     "test": "npm run test:unit && npm run test:e2e",
     "typecheck": "tsc --noEmit",
     "watch": "rslib build --watch",
+    "watch:local": "cross-env SOURCEMAP=true rslib build --watch",
     "package:vsce": "npm run build && vsce package"
   },
   "devDependencies": {
@@ -77,6 +88,7 @@
     "glob": "^7.2.3",
     "mocha": "^11.7.4",
     "ovsx": "^0.10.6",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "valibot": "^1.1.0"
   }
 }

packages/vscode/src/config.ts

@@ -1,66 +1,69 @@
+import * as v from 'valibot';
 import vscode from 'vscode';
 
 // Centralized configuration types for the extension.
 // Add new keys here to extend configuration in a type-safe way.
-export type ExtensionConfig = {
+const configSchema = v.object({
   // Glob patterns that determine which files are considered tests.
   // Must be an array of strings.
-  testFileGlobPattern: string[];
-  // The path to a package.json file of a Rstest executable.
-  // Used as a last resort if the extension cannot auto-detect @rstest/core.
-  rstestPackagePath?: string;
-};
-
-export const defaultConfig: ExtensionConfig = {
-  // https://code.visualstudio.com/docs/editor/glob-patterns
-  testFileGlobPattern: [
+  testFileGlobPattern: v.fallback(v.array(v.string()), [
     '**/*.{test,spec}.[jt]s',
     '**/*.{test,spec}.[cm][jt]s',
     '**/*.{test,spec}.[jt]sx',
     '**/*.{test,spec}.[cm][jt]sx',
-  ],
-};
+  ]),
+  // The path to a package.json file of a Rstest executable.
+  // Used as a last resort if the extension cannot auto-detect @rstest/core.
+  rstestPackagePath: v.fallback(v.optional(v.string()), undefined),
+  configFileGlobPattern: v.fallback(v.array(v.string()), [
+    '**/rstest.config.{mjs,ts,js,cjs,mts,cts}',
+  ]),
+});
+
+export type ExtensionConfig = v.InferOutput<typeof configSchema>;
 
-// Type-safe getter for a single config value with priority:
-// workspaceFolder > workspace > user (global) > default.
+// Type-safe getter for a single config value
 export function getConfigValue<K extends keyof ExtensionConfig>(
   key: K,
-  folder?: vscode.WorkspaceFolder,
+  scope?: vscode.ConfigurationScope | null,
 ): ExtensionConfig[K] {
-  const section = vscode.workspace.getConfiguration('rstest', folder);
-  const inspected = section.inspect<ExtensionConfig[K]>(key);
-
-  // Priority order (highest first): folder, workspace, user, default
-  const value =
-    inspected?.workspaceFolderValue ??
-    inspected?.workspaceValue ??
-    inspected?.globalValue ??
-    inspected?.defaultValue ??
-    defaultConfig[key];
-
-  if (key === 'testFileGlobPattern') {
-    const v = value as unknown;
-    return (isStringArray(v) ? v : defaultConfig[key]) as ExtensionConfig[K];
-  }
-
-  if (key === 'rstestPackagePath') {
-    const v = value as unknown;
-    return (
-      typeof v === 'string' && v.trim().length > 0 ? v : undefined
-    ) as ExtensionConfig[K];
-  }
-
-  return value as ExtensionConfig[K];
+  const value = vscode.workspace.getConfiguration('rstest', scope).get(key);
+  return v.parse(configSchema.entries[key], value) as ExtensionConfig[K];
 }
 
-function isStringArray(v: unknown): v is string[] {
-  return Array.isArray(v) && v.every((x) => typeof x === 'string');
+// Convenience to get a full, normalized config object at the given scope.
+export function getConfig(
+  scope?: vscode.ConfigurationScope | null,
+): ExtensionConfig {
+  return Object.fromEntries(
+    Object.keys(configSchema.entries).map((key) => [
+      key,
+      getConfigValue(key as keyof ExtensionConfig, scope),
+    ]),
+  ) as ExtensionConfig;
 }
 
-// Convenience to get a full, normalized config object at the given scope.
-export function getConfig(folder?: vscode.WorkspaceFolder): ExtensionConfig {
+export function watchConfigValue<K extends keyof ExtensionConfig>(
+  key: K,
+  scope: vscode.ConfigurationScope | null | undefined,
+  listener: (
+    value: ExtensionConfig[K],
+    token: vscode.CancellationToken,
+  ) => void,
+): vscode.Disposable {
+  let cancelSource = new vscode.CancellationTokenSource();
+  listener(getConfigValue(key, scope), cancelSource.token);
+  const disposable = vscode.workspace.onDidChangeConfiguration((e) => {
+    if (e.affectsConfiguration(`rstest.${key}`, scope ?? undefined)) {
+      cancelSource.cancel();
+      cancelSource = new vscode.CancellationTokenSource();
+      listener(getConfigValue(key, scope), cancelSource.token);
+    }
+  });
   return {
-    testFileGlobPattern: getConfigValue('testFileGlobPattern', folder),
-    rstestPackagePath: getConfigValue('rstestPackagePath', folder),
-  } satisfies ExtensionConfig;
+    dispose: () => {
+      disposable.dispose();
+      cancelSource.cancel();
+    },
+  };
 }