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

package/lib/state/reconciling-transfer-hydranium-glsp-state.js

@@ -28,16 +28,16 @@ import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
  *   field-level shape is what lets `fast-json-patch` diff per field, so undo /
  *   redo and forward-write reconcile act per field instead of clobbering the
  *   whole document.
- * - {@link baseline} — the last in-sync projection, captured on every
+ * - {@link base} — the last in-sync projection, captured on every
  *   {@link setSourceRoot}. A forward-write conflict reconciles the user's
- *   intent (baseline → attempted) against the fresh server root.
+ *   intent (base → ours) against the server's current root (theirs).
  * - {@link updateSourceModel} — the concrete reconcile template: persist,
  *   and on a `ConflictError` consult the injected `conflictResolver` and act
  *   on the merged / no-op / conflict / unavailable outcome.
  * - {@link persist} / {@link refetch} — the only I/O seams. Defaults route
- *   through `ModelService.update` / `.validated` (reachable from the base via
- *   `sharedServices.model`); adopters whose document round-trip differs
- *   override these without touching the orchestration.
+ *   through the diagram session's `update` and `ModelService.validated`;
+ *   adopters whose document round-trip differs override these without
+ *   touching the orchestration.
  *
  * Adopters whose source model is whole-document text (a bare `{ text }`
  * source model) or that are read-only do NOT extend this class — they extend
@@ -49,12 +49,12 @@ import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
 let ReconcilingTransferHydraniumGlspState = class ReconcilingTransferHydraniumGlspState extends AbstractHydraniumGlspState {
     /**
      * Last in-sync source-model projection, captured on every
-     * {@link setSourceRoot} (initial load + post-update). The baseline a
+     * {@link setSourceRoot} (initial load + post-update). The base a
      * forward-write conflict reconciles against: it stays the pre-command
      * state because operation handlers mutate `_sourceRoot` in place during
      * `execute` while `setSourceRoot` only re-runs once the write commits.
      */
-    baseline;
+    base;
     /**
      * Persisted-shape projection of the current source root, consumed by GLSP's
      * {@link JsonModelState} read side and recorded for field-level undo / redo.
@@ -68,27 +68,27 @@ let ReconcilingTransferHydraniumGlspState = class ReconcilingTransferHydraniumGl
     }
     setSourceRoot(uri, root) {
         super.setSourceRoot(uri, root);
-        this.baseline = this.sourceModel;
+        this.base = this.sourceModel;
     }
     /**
      * Persist `model` back to the document store, then capture the resulting
      * AST root. On a `ConflictError` (the based-on version was superseded),
-     * reconcile the user's intent against the fresh server root via the bound
+     * reconcile the user's intent against the server's current root via the bound
      * `conflictResolver` and act on the outcome — one declarative policy
      * (force = last-writer-wins, reconciling = field-level merge) shared with
      * undo / redo.
      */
-    async updateSourceModel(model, version) {
+    async updateSourceModel(model, basedOn = this.basedOn) {
         // Orchestration lives in `reconcileSourceModelWrite` so the multi-document
         // state gets the identical conflict handling; this method supplies only
         // the single-document meaning of persist / project.
-        return reconcileSourceModelWrite(model, version, {
-            persist: async (candidate, baseVersion) => {
-                const { root } = await this.persist(candidate, baseVersion);
+        return reconcileSourceModelWrite(model, basedOn, {
+            persist: async (candidate, candidateBasedOn) => {
+                const { root } = await this.persist(candidate, candidateBasedOn);
                 this.setSourceRoot(this._sourceUri, root);
             },
             refetch: () => this.refetch(),
-            baseline: this.baseline,
+            base: this.base,
             conflictResolver: this.conflictResolver,
             logger: this.logger,
             onConflictDropped: () => this.refreshSourceRoot()
@@ -96,30 +96,26 @@ let ReconcilingTransferHydraniumGlspState = class ReconcilingTransferHydraniumGl
     }
     /**
      * Persist hook — the only write-side I/O. Default routes the structured
-     * model through `ModelService.update` (serialize → reparse), opting into
-     * the `ConflictError` gate when `version` is given. Adopters whose document
+     * model through the diagram session's `update` (serialize → reparse),
+     * opting into the `ConflictError` gate unless `basedOn` is `'anything'`,
+     * and throws without a session. Adopters whose document
      * round-trip differs override this; the orchestration in
      * {@link updateSourceModel} is unchanged.
      */
-    async persist(model, baseVersion) {
-        const document = await this.sharedServices.model.ModelService.update({
-            uri: this._sourceUri,
-            model,
-            clientId: this.clientId,
-            baseVersion
-        });
+    async persist(model, basedOn) {
+        const document = await this.requireModelSession().update({ uri: this._sourceUri, model, basedOn });
         return document;
     }
     /**
-     * Refetch hook — reads the current settled server root as a persisted-shape
-     * projection (or `undefined` when unavailable). The `conflictResolver`
-     * replays the user's intent against this fresh state. Default uses
-     * `ModelService.validated` + the framework encoder's `'grammar'` mode;
-     * adopters override alongside {@link persist}.
+     * Refetch hook — the stored text parsed afresh, as a persisted-shape
+     * projection (or `undefined` when unavailable): theirs, which the
+     * `conflictResolver` replays the user's intent onto. Default uses
+     * {@link AbstractHydraniumGlspState.readCurrentRoot} + the framework
+     * encoder's `'grammar'` mode; adopters override alongside {@link persist}.
      */
     async refetch() {
-        const fresh = await this.sharedServices.model.ModelService.validated(this._sourceUri).catch(() => undefined);
-        return fresh ? this.sharedServices.model.TransferEncoder.toTransfer(fresh.root, 'grammar') : undefined;
+        const theirs = await this.readCurrentRoot(this._sourceUri);
+        return theirs ? this.sharedServices.model.TransferEncoder.toTransfer(theirs, 'grammar') : undefined;
     }
 };
 ReconcilingTransferHydraniumGlspState = __decorate([

package/lib/state/reconciling-transfer-hydranium-glsp-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconciling-transfer-hydranium-glsp-state.js","sourceRoot":"","sources":["../../src/state/reconciling-transfer-hydranium-glsp-state.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;AAGlF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,qCAAqC,GAA3C,MAAM,qCACV,SAAQ,0BAA+C;IAGvD;;;;;;OAMG;IACO,QAAQ,CAAgB;IAElC;;;;;;;OAOG;IACH,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAA4B,CAAC;IACvH,CAAC;IAEQ,aAAa,CAAC,GAAW,EAAE,IAAW;QAC5C,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;IACpC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iBAAiB,CAAC,KAAmB,EAAE,OAAgB;QAC1D,2EAA2E;QAC3E,wEAAwE;QACxE,oDAAoD;QACpD,OAAO,yBAAyB,CAAe,KAAK,EAAE,OAAO,EAAE;YAC5D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE;gBACvC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;gBAC5D,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;SACnD,CAAC,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,OAAO,CAAC,KAAmB,EAAE,WAAoB;QAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;YAClE,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,KAAK;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW;SACb,CAAC,CAAC;QACH,OAAO,QAAsC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,OAAO;QACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC7G,OAAO,KAAK,CAAC,CAAC,CAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;IACvI,CAAC;CACH,CAAA;AAnFY,qCAAqC;IADjD,UAAU,EAAE;GACA,qCAAqC,CAmFjD"}
+{"version":3,"file":"reconciling-transfer-hydranium-glsp-state.js","sourceRoot":"","sources":["../../src/state/reconciling-transfer-hydranium-glsp-state.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;AAGlF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,qCAAqC,GAA3C,MAAM,qCACV,SAAQ,0BAA+C;IAGvD;;;;;;OAMG;IACO,IAAI,CAAgB;IAE9B;;;;;;;OAOG;IACH,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAA4B,CAAC;IACvH,CAAC;IAEQ,aAAa,CAAC,GAAW,EAAE,IAAW;QAC5C,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;IAChC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iBAAiB,CAAC,KAAmB,EAAE,UAAmB,IAAI,CAAC,OAAO;QACzE,2EAA2E;QAC3E,wEAAwE;QACxE,oDAAoD;QACpD,OAAO,yBAAyB,CAAe,KAAK,EAAE,OAAO,EAAE;YAC5D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,EAAE;gBAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;gBACjE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;SACnD,CAAC,CAAC;IACN,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,OAAO,CAAC,KAAmB,EAAE,OAAgB;QAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACnG,OAAO,QAAsC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,OAAO;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,CAAC,CAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;IACpI,CAAC;CACH,CAAA;AA/EY,qCAAqC;IADjD,UAAU,EAAE;GACA,qCAAqC,CA+EjD"}

package/lib/storage/hydranium-glsp-request-save-model-action-handler.d.ts

@@ -0,0 +1,30 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { type Action, SaveModelActionHandler } from '@eclipse-glsp/server';
+/**
+ * Answers a {@link RequestSaveModelAction}: saves exactly as GLSP's
+ * {@link SaveModelActionHandler} saves a `SaveModelAction` carrying the same
+ * `fileUri`, dirty-state change included, then replies with a
+ * {@link ModelSavedAction}.
+ *
+ * A failed save throws, and the server turns the throw into a `RejectAction`
+ * for the request. The save handler's own `SaveModelAction` stays registered,
+ * so a client that sends it is unaffected.
+ *
+ * `AbstractHydraniumGlspDiagramModule` registers it. A diagram module that does
+ * not extend that base adds it in `configureActionHandlers`. Without it no
+ * handler is advertised for the request, and the Theia client saves as GLSP's
+ * saveable does: a save nothing answers, so a failed one surfaces only as a
+ * timeout, and a window can close over a save still under way.
+ */
+export declare class HydraniumGlspRequestSaveModelActionHandler extends SaveModelActionHandler {
+    actionKinds: string[];
+    execute(action: Action): Promise<Action[]>;
+}
+//# sourceMappingURL=hydranium-glsp-request-save-model-action-handler.d.ts.map

package/lib/storage/hydranium-glsp-request-save-model-action-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydranium-glsp-request-save-model-action-handler.d.ts","sourceRoot":"","sources":["../../src/storage/hydranium-glsp-request-save-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,MAAM,EAAmB,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAI5F;;;;;;;;;;;;;;;GAeG;AACH,qBACa,0CAA2C,SAAQ,sBAAsB;IAC1E,WAAW,WAAiC;IAGtC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAK3D"}

package/lib/storage/hydranium-glsp-request-save-model-action-handler.js

@@ -0,0 +1,47 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { SaveModelAction, SaveModelActionHandler } from '@eclipse-glsp/server';
+import { ModelSavedAction, RequestSaveModelAction } from '@hydranium/protocol';
+import { injectable } from 'inversify';
+/**
+ * Answers a {@link RequestSaveModelAction}: saves exactly as GLSP's
+ * {@link SaveModelActionHandler} saves a `SaveModelAction` carrying the same
+ * `fileUri`, dirty-state change included, then replies with a
+ * {@link ModelSavedAction}.
+ *
+ * A failed save throws, and the server turns the throw into a `RejectAction`
+ * for the request. The save handler's own `SaveModelAction` stays registered,
+ * so a client that sends it is unaffected.
+ *
+ * `AbstractHydraniumGlspDiagramModule` registers it. A diagram module that does
+ * not extend that base adds it in `configureActionHandlers`. Without it no
+ * handler is advertised for the request, and the Theia client saves as GLSP's
+ * saveable does: a save nothing answers, so a failed one surfaces only as a
+ * timeout, and a window can close over a save still under way.
+ */
+let HydraniumGlspRequestSaveModelActionHandler = class HydraniumGlspRequestSaveModelActionHandler extends SaveModelActionHandler {
+    actionKinds = [RequestSaveModelAction.KIND];
+    // Typed `Action`, the one parameter type both this kind and the base's accept.
+    async execute(action) {
+        const fileUri = 'fileUri' in action && typeof action.fileUri === 'string' ? action.fileUri : undefined;
+        const actions = await super.execute(SaveModelAction.create({ fileUri }));
+        return [...actions, ModelSavedAction.create()];
+    }
+};
+HydraniumGlspRequestSaveModelActionHandler = __decorate([
+    injectable()
+], HydraniumGlspRequestSaveModelActionHandler);
+export { HydraniumGlspRequestSaveModelActionHandler };
+//# sourceMappingURL=hydranium-glsp-request-save-model-action-handler.js.map

package/lib/storage/hydranium-glsp-request-save-model-action-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydranium-glsp-request-save-model-action-handler.js","sourceRoot":"","sources":["../../src/storage/hydranium-glsp-request-save-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;AAElF,OAAO,EAAe,eAAe,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC;;;;;;;;;;;;;;;GAeG;AAEI,IAAM,0CAA0C,GAAhD,MAAM,0CAA2C,SAAQ,sBAAsB;IAC1E,WAAW,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAErD,+EAA+E;IACtE,KAAK,CAAC,OAAO,CAAC,MAAc;QAClC,MAAM,OAAO,GAAG,SAAS,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACvG,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,OAAO,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;CACH,CAAA;AATY,0CAA0C;IADtD,UAAU,EAAE;GACA,0CAA0C,CAStD"}