@hydranium/core 1.0.0-next.117 → 1.0.0-next.123

package/src/testing/stub-ast-document-manager.ts

@@ -22,14 +22,14 @@ import type { StubLangiumDocuments } from './stub-langium-documents.js';
 
 /**
  * Minimal stub of {@link AstDocumentManager} for use in test
- * harnesses. Implements just the methods the framework's
- * `ModelService` calls (`open` / `close` / `update` / `save` /
- * `isOpen` / `getDocument`) and a disk queue that runs each task at once;
+ * harnesses. Implements just the methods the model service and client
+ * sessions call (`open` / `close` / `update` / `save` / `isOpen` /
+ * `getDocument`);
  * `onSave` / `onClientClosed` forward to the underlying stub text store,
  * `onUpdate` is driven explicitly
  * through {@link StubAstDocumentManager.emitUpdate} because the stub tree runs
  * no build phases to emit from, and the remaining read helpers
- * (`isTriggeringEdit`, `getAuthor`) throw if invoked — tests that need them
+ * (`getAuthor`) throw if invoked — tests that need them
  * should wire a richer stub or use the real {@link AstDocumentManager}.
  *
  * Open state is tracked per URI as the set of holding client ids, so a
@@ -48,18 +48,7 @@ import type { StubLangiumDocuments } from './stub-langium-documents.js';
  */
 export interface StubAstDocumentManager<TAst extends AstNode, TDiagnostic extends AstDiagnostic = AstDiagnostic> extends Pick<
    AstDocumentManager<TAst, TDiagnostic>,
-   | 'open'
-   | 'close'
-   | 'isOpen'
-   | 'update'
-   | 'save'
-   | 'queueDiskTask'
-   | 'onUpdate'
-   | 'onSave'
-   | 'onClientClosed'
-   | 'getAuthor'
-   | 'getDocument'
-   | 'isTriggeringEdit'
+   'open' | 'close' | 'isOpen' | 'update' | 'save' | 'onUpdate' | 'onSave' | 'onClientClosed' | 'getAuthor' | 'getDocument'
 > {
    readonly openClients: Map<string, Set<string>>;
 
@@ -132,10 +121,13 @@ export function makeStubAstDocumentManager<TAst extends AstNode, TDiagnostic ext
          clients.add(args.clientId);
          openClients.set(args.uri, clients);
          // The real `open` materialises the synced document (from the payload
-         // text or the filesystem); mirror that so a subsequent `update` finds
-         // an open document to apply its content change to.
+         // text or the filesystem), or attaches the client to the one that is
+         // there; mirror both so a subsequent `update` finds the document open
+         // for this client.
          if (!textDocuments.get(args.uri)) {
             textDocuments.seedOpen(args.uri, args.text ?? '', args.clientId);
+         } else {
+            textDocuments.attachClient(args.uri, args.clientId);
          }
          return Disposable.create(() => close({ uri: args.uri, clientId: args.clientId }));
       },
@@ -153,9 +145,6 @@ export function makeStubAstDocumentManager<TAst extends AstNode, TDiagnostic ext
          await fileSystem.writeFile(UriUtils.toUri(uri), text);
          textDocuments.notifyDidSaveTextDocument({ textDocument: { uri }, text }, clientId);
       },
-      queueDiskTask<T>(_uri: string, task: () => Promise<T>): Promise<T> {
-         return task();
-      },
       // Registers the listener but never calls it by itself — the real manager
       // emits from a `DocumentBuilder.onDocumentPhase(Validated)` hook and the
       // stub tree runs no phases. `emitUpdate` is the only thing that fires it;
@@ -217,9 +206,6 @@ export function makeStubAstDocumentManager<TAst extends AstNode, TDiagnostic ext
       // that need real symlink canonicalization wire the real AstDocumentManager).
       getDocument(uri: string): LangiumDocument | undefined {
          return documents?.getDocument(UriUtils.toUri(uri));
-      },
-      isTriggeringEdit(): boolean {
-         return notSupported('isTriggeringEdit');
       }
    };
 }

package/src/testing/stub-hydranium-text-documents.ts

@@ -9,11 +9,11 @@
 
 import type { CanonicalUri } from '@hydranium/protocol';
 import type { ApplyWorkspaceEditResult } from 'vscode-languageserver';
-import { Disposable } from 'vscode-languageserver';
+import { Disposable, Emitter } from 'vscode-languageserver';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { LANGUAGE_CLIENT_ID } from '../documents/client-ids.js';
 import { ClientSessionRegistry } from '../documents/client-session-registry.js';
-import type { ClientTextDocumentChangeEvent, HydraniumTextDocuments } from '../documents/hydranium-text-documents.js';
+import type { ClientTextDocumentChangeEvent, HydraniumTextDocuments, LastOpenClosedEvent } from '../documents/hydranium-text-documents.js';
 
 /** Snapshot of an open document tracked by the stub. */
 export interface StubTextDocumentEntry {
@@ -28,11 +28,12 @@ export interface StubTextDocumentEntry {
  * reads from on test paths — the content channel
  * (`notifyDidChangeTextDocument` / `applyContentChange` / `version` /
  * `getAuthor`), the open-state probes (`isOpenInLanguageClient` /
- * `isOpenInAnyClient` / `isOpenInClient` / `openDocuments`), the push channel
+ * `isOpenInAnyClient` / `isOpenInClient` / `isRevertPending` /
+ * `openDocuments`), the push channel
  * to the language client (`applyEditToLanguageClient` / `stagePendingContent`),
  * the save / close notifications, and the client-session table
- * (`registerSession` / `closeSession` / `onDidCloseSession` and the open
- * options), which is a real `ClientSessionRegistry` — plus test-only helpers:
+ * (`registerSession` / `closeSession` / `onDidCloseSession`), which is a real
+ * `ClientSessionRegistry` — plus test-only helpers:
  *
  * - {@link seedOpen} — pre-populate an open document without firing change
  *   events. Use to set up a baseline version before exercising an `update`.
@@ -69,15 +70,16 @@ export interface StubHydraniumTextDocuments extends Pick<
    | 'getAuthor'
    | 'isOpenInLanguageClient'
    | 'isOpenInAnyClient'
+   | 'isRevertPending'
    | 'applyEditToLanguageClient'
    | 'stagePendingContent'
    | 'openDocuments'
    | 'isOpenInClient'
+   | 'attachClient'
    | 'registerSession'
    | 'closeSession'
    | 'onDidCloseSession'
-   | 'openOptions'
-   | 'setOpenOptions'
+   | 'onDidCloseLastOpen'
 > {
    /**
     * Stub-tailored read accessor. Returns just the surface the framework's
@@ -100,7 +102,11 @@ export interface StubHydraniumTextDocuments extends Pick<
    seedOpen(uri: string, text: string, clientId: string): void;
    /** Mark `uri` as open in the LSP textual language client (drives {@link isOpenInLanguageClient}). */
    seedOpenInLanguageClient(uri: string): void;
-   /** Synchronously deliver `onDidClose` to subscribers. */
+   /**
+    * Synchronously deliver `onDidClose` to subscribers, then `onDidCloseLastOpen`
+    * when no client has `uri` open any more. The stub keeps no revert grace, so
+    * a last close is announced at once.
+    */
    fireClose(uri: string, clientId: string): void;
    /**
     * Drop recorded state. Useful for `beforeEach` resets.
@@ -140,11 +146,12 @@ export function makeStubHydraniumTextDocuments(): StubHydraniumTextDocuments {
    let applyEditHandler: (uri: string, text: string) => ApplyWorkspaceEditResult | undefined = () => ({ applied: true });
    const saveListeners: Array<(event: { document: { uri: string }; clientId: string }) => void> = [];
    const closeListeners: Array<(event: ClientTextDocumentChangeEvent<TextDocument>) => void> = [];
-   // The real registry, so the session table, the opens, the closing state and
-   // the open options behave as the store's do. The stub's plain-string keys
+   // The real registry, so the session table, the opens and the closing state
+   // behave as the store's do. The stub's plain-string keys
    // stand in for canonical URIs (one stub-boundary cast, like `fireClose`).
    const sessions = new ClientSessionRegistry();
    const key = (uri: string): CanonicalUri => uri as CanonicalUri;
+   const lastOpenClosed = new Emitter<LastOpenClosedEvent>();
 
    const stub: StubHydraniumTextDocuments = {
       get changes() {
@@ -230,6 +237,12 @@ export function makeStubHydraniumTextDocuments(): StubHydraniumTextDocuments {
       isOpenInClient(uri, clientId) {
          return sessions.isOpenIn(key(uri), clientId);
       },
+      isRevertPending(uri) {
+         return sessions.isRevertPending(key(uri));
+      },
+      attachClient(uri, clientId) {
+         return docs.has(uri) && sessions.addOpen(key(uri), clientId);
+      },
       registerSession(clientId) {
          sessions.register(clientId);
       },
@@ -248,11 +261,8 @@ export function makeStubHydraniumTextDocuments(): StubHydraniumTextDocuments {
       get onDidCloseSession() {
          return sessions.onDidCloseSession;
       },
-      openOptions(uri, clientId) {
-         return sessions.openOptions(key(uri), clientId);
-      },
-      setOpenOptions(uri, clientId, options) {
-         sessions.setOpenOptions(key(uri), clientId, options);
+      get onDidCloseLastOpen() {
+         return lastOpenClosed.event;
       },
       openDocuments() {
          // From the registry that also answers `isOpenInClient`, which both
@@ -285,7 +295,7 @@ export function makeStubHydraniumTextDocuments(): StubHydraniumTextDocuments {
          if (holder && holder.clientId === clientId) {
             docs.delete(uri);
          }
-         sessions.removeOpen(key(uri), clientId);
+         const removed = sessions.removeOpen(key(uri), clientId);
          if (clientId === LANGUAGE_CLIENT_ID) {
             languageClientOpen.delete(uri);
          }
@@ -293,6 +303,9 @@ export function makeStubHydraniumTextDocuments(): StubHydraniumTextDocuments {
          for (const listener of closeListeners.slice()) {
             listener(event);
          }
+         if (removed && !sessions.isOpen(key(uri))) {
+            lastOpenClosed.fire({ uri: key(uri) });
+         }
       },
       reset() {
          docs.clear();

package/src/testing/stub-model-service.ts

@@ -53,8 +53,8 @@ export type StubModelService<
  * `makeTestServices` wires this stub automatically.
  *
  * `options` are the framework {@link ModelServiceOptions}, forwarded verbatim, so
- * a test can exercise an option-gated code path (`serializeBuilds`, the slow-warn
- * threshold) without hand-rolling a subclass just to reach the constructor.
+ * a test can exercise an option-gated code path (`serializeBuilds`) without
+ * hand-rolling a subclass just to reach the constructor.
  *
  * Adopters that need richer override behaviour — the framework's own extension
  * surface is {@link ModelService.rewriteModel} alongside `serialize` — should