@hydranium/glsp-server 1.0.0-next.12 → 1.0.0-next.123

package/src/storage/index.ts

@@ -8,4 +8,4 @@
  ********************************************************************************/
 
 export * from './hydranium-glsp-storage.js';
-export * from './save-conflict-policy.js';
+export * from './save-delivery-policy.js';

package/src/storage/save-delivery-policy.ts

@@ -0,0 +1,44 @@
+/********************************************************************************
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+
+/**
+ * How `HydraniumGlspStorage.saveSourceModel` delivers its result: whether the
+ * GLSP save action awaits the write, and what happens on failure.
+ *
+ * The two are not independent — fire-and-forget plus rethrow would leave an
+ * unhandled rejection — so each arm bundles them into one coherent, nameable
+ * policy an adopter selects whole. It is a *selection of configuration*,
+ * delivered as a bound option (see the {@link SaveDeliveryPolicy} symbol) rather
+ * than a behaviour hook.
+ *
+ * **Neither arm guards on a based-on version.** A save flushes the store's
+ * settled text rather than authoring from the diagram's captured model, and the
+ * store already holds every other client's change — so a guard here refuses a
+ * write whose content is already correct. The gate that does exist sits on the
+ * update path, per operation, where the diagram authors.
+ */
+export type SaveDeliveryPolicy =
+   /** Await the write and propagate any failure to the GLSP save action. The default. */
+   | { kind: 'await' }
+   /**
+    * Fire-and-forget, logging and swallowing every failure. Correct when a
+    * failed diagram save must neither block the action nor surface as an error.
+    */
+   | { kind: 'fire-and-forget' };
+
+/** The policy applied when no {@link SaveDeliveryPolicy} option is bound. */
+export const DEFAULT_SAVE_DELIVERY_POLICY: SaveDeliveryPolicy = { kind: 'await' };
+
+/**
+ * DI token for the {@link SaveDeliveryPolicy} option. Bind a constant value in a
+ * `DiagramModule` to select a non-default policy; left unbound,
+ * `HydraniumGlspStorage` falls back to {@link DEFAULT_SAVE_DELIVERY_POLICY}.
+ * Shares its name with the type, the way a `class` is both a value and a type.
+ */
+export const SaveDeliveryPolicy = Symbol('SaveDeliveryPolicy');

package/src/validation/diagnostic-markers.ts

@@ -10,7 +10,7 @@
 import { type Marker, MarkerKind } from '@eclipse-glsp/protocol';
 import { type AstNode } from '@hydranium/langium';
 import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-types';
-import { type TransferLspDiagnostic } from '@hydranium/core';
+import { type AstDiagnostic } from '@hydranium/core';
 
 /**
  * The model-shaped lookups the diagnostic→marker translation needs, injected so
@@ -48,7 +48,7 @@ export interface DiagnosticMarkerLookups {
  * `MarkersReason` so a fresh `SetMarkersAction` replaces the previous markers
  * (an empty result clears them when all errors are fixed).
  */
-export function diagnosticsToMarkers(diagnostics: readonly TransferLspDiagnostic[], lookups: DiagnosticMarkerLookups): Marker[] {
+export function diagnosticsToMarkers(diagnostics: readonly AstDiagnostic[], lookups: DiagnosticMarkerLookups): Marker[] {
    const markers: Marker[] = [];
    for (const diagnostic of diagnostics) {
       const kind = markerKind(diagnostic.severity);
@@ -65,8 +65,15 @@ export function diagnosticsToMarkers(diagnostics: readonly TransferLspDiagnostic
  * The ids of the elements drawn on this diagram for the diagnostic's target,
  * starting at the node it points at and walking up its containers; empty when
  * the path does not resolve or nothing on the chain is rendered.
+ *
+ * @param elementPath absent for a lexer or parser error, which Langium pushes
+ *    onto the document without one — such a diagnostic points at text no node
+ *    was built from, so it marks nothing.
  */
-function renderedElementIds(elementPath: string, lookups: DiagnosticMarkerLookups): readonly string[] {
+function renderedElementIds(elementPath: string | undefined, lookups: DiagnosticMarkerLookups): readonly string[] {
+   if (elementPath === undefined) {
+      return [];
+   }
    let node: AstNode | undefined = lookups.resolveElement(elementPath);
    while (node !== undefined) {
       const ids = lookups.renderedIdsFor(node);

package/src/validation/hydranium-glsp-model-validator.ts

@@ -12,7 +12,7 @@ import { type GModelElement, ModelState, type ModelValidator } from '@eclipse-gl
 import { inject, injectable } from 'inversify';
 import { type AstNode } from '@hydranium/langium';
 import { URI } from '@hydranium/langium';
-import { type ServerSharedServices, type TransferLspDiagnostic } from '@hydranium/core';
+import { type ServerSharedServices, type AstDiagnostic } from '@hydranium/core';
 import { type AbstractHydraniumGlspState } from '../state/abstract-hydranium-glsp-state.js';
 import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
 import { type DiagnosticMarkerLookups, diagnosticsToMarkers } from './diagnostic-markers.js';
@@ -75,9 +75,9 @@ export class HydraniumGlspModelValidator<TRoot extends AstNode = AstNode> implem
             continue;
          }
          // Diagnostics are produced by the framework's `HydraniumDocumentValidator`,
-         // which emits `TransferLspDiagnostic` (LSP `Diagnostic` + `element` path).
+         // which emits `AstDiagnostic` (LSP `Diagnostic` + `element` path).
          // Parser/lexer diagnostics carry no `element`; the lookup drops them.
-         const diagnostics = document.diagnostics as TransferLspDiagnostic[] | undefined;
+         const diagnostics = document.diagnostics as AstDiagnostic[] | undefined;
          if (!diagnostics || diagnostics.length === 0) {
             continue;
          }

package/lib/storage/save-conflict-policy.d.ts

@@ -1,56 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the MIT License which is available in the project root.
- *
- * SPDX-License-Identifier: MIT
- ********************************************************************************/
-/**
- * How `HydraniumGlspStorage.saveSourceModel` reacts when a concurrent edit has
- * advanced the document past the version this diagram was last captured at.
- *
- * A save spans otherwise-independent choices — whether to guard on the captured
- * based-on version, whether the GLSP save action awaits the persist, and what
- * happens on failure. Each arm bundles those into one coherent, nameable policy
- * so an adopter selects a whole behaviour rather than assembling an incoherent
- * mix: fire-and-forget plus rethrow would leave an unhandled rejection. It is a
- * *selection of configuration*, delivered as a bound option (see the
- * {@link SaveConflictPolicy} symbol) rather than a behaviour hook.
- */
-export type SaveConflictPolicy = 
-/**
- * Last-write-wins: no based-on guard, await the persist, propagate any
- * failure to the GLSP save action. The default; correct for a single-editor
- * head where nothing races the save.
- */
-{
-    kind: 'overwrite';
-}
-/**
- * Guard on the captured version, await the persist, and surface a
- * `ConflictError` (and any other failure) to the GLSP save action.
- */
- | {
-    kind: 'reject';
-}
-/**
- * Guard on the captured version, fire-and-forget, and log + swallow every
- * failure. Correct when another editor of the same document may already have
- * written the truth, so a stale diagram save is benign and must neither
- * block the action nor surface as an error.
- */
- | {
-    kind: 'drop-and-log';
-};
-/** The policy applied when no {@link SaveConflictPolicy} option is bound. */
-export declare const DEFAULT_SAVE_CONFLICT_POLICY: SaveConflictPolicy;
-/**
- * DI token for the {@link SaveConflictPolicy} option. Bind a constant value in a
- * `DiagramModule` to select a non-default policy; left unbound,
- * `HydraniumGlspStorage` falls back to
- * {@link DEFAULT_SAVE_CONFLICT_POLICY}. Shares its name with the type, the way a
- * `class` is both a value and a type.
- */
-export declare const SaveConflictPolicy: unique symbol;
-//# sourceMappingURL=save-conflict-policy.d.ts.map

package/lib/storage/save-conflict-policy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"save-conflict-policy.d.ts","sourceRoot":"","sources":["../../src/storage/save-conflict-policy.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,kBAAkB;AAC3B;;;;GAIG;AACD;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;AACvB;;;GAGG;GACD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE;AACpB;;;;;GAKG;GACD;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAE9B,6EAA6E;AAC7E,eAAO,MAAM,4BAA4B,EAAE,kBAA0C,CAAC;AAEtF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,eAA+B,CAAC"}

package/lib/storage/save-conflict-policy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"save-conflict-policy.js","sourceRoot":"","sources":["../../src/storage/save-conflict-policy.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAkClF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,4BAA4B,GAAuB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAEtF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC"}

package/src/storage/save-conflict-policy.ts

@@ -1,52 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the MIT License which is available in the project root.
- *
- * SPDX-License-Identifier: MIT
- ********************************************************************************/
-
-/**
- * How `HydraniumGlspStorage.saveSourceModel` reacts when a concurrent edit has
- * advanced the document past the version this diagram was last captured at.
- *
- * A save spans otherwise-independent choices — whether to guard on the captured
- * based-on version, whether the GLSP save action awaits the persist, and what
- * happens on failure. Each arm bundles those into one coherent, nameable policy
- * so an adopter selects a whole behaviour rather than assembling an incoherent
- * mix: fire-and-forget plus rethrow would leave an unhandled rejection. It is a
- * *selection of configuration*, delivered as a bound option (see the
- * {@link SaveConflictPolicy} symbol) rather than a behaviour hook.
- */
-export type SaveConflictPolicy =
-   /**
-    * Last-write-wins: no based-on guard, await the persist, propagate any
-    * failure to the GLSP save action. The default; correct for a single-editor
-    * head where nothing races the save.
-    */
-   | { kind: 'overwrite' }
-   /**
-    * Guard on the captured version, await the persist, and surface a
-    * `ConflictError` (and any other failure) to the GLSP save action.
-    */
-   | { kind: 'reject' }
-   /**
-    * Guard on the captured version, fire-and-forget, and log + swallow every
-    * failure. Correct when another editor of the same document may already have
-    * written the truth, so a stale diagram save is benign and must neither
-    * block the action nor surface as an error.
-    */
-   | { kind: 'drop-and-log' };
-
-/** The policy applied when no {@link SaveConflictPolicy} option is bound. */
-export const DEFAULT_SAVE_CONFLICT_POLICY: SaveConflictPolicy = { kind: 'overwrite' };
-
-/**
- * DI token for the {@link SaveConflictPolicy} option. Bind a constant value in a
- * `DiagramModule` to select a non-default policy; left unbound,
- * `HydraniumGlspStorage` falls back to
- * {@link DEFAULT_SAVE_CONFLICT_POLICY}. Shares its name with the type, the way a
- * `class` is both a value and a type.
- */
-export const SaveConflictPolicy = Symbol('SaveConflictPolicy');