@opendaw/lib-box 0.0.63 → 0.0.64

package/dist/editing.d.ts

@@ -1,5 +1,5 @@
 import { BoxGraph } from "./graph";
-import { Editing, Maybe, Option, SyncProvider } from "@opendaw/lib-std";
+import { Editing, Maybe, Observer, Option, Subscription, SyncProvider } from "@opendaw/lib-std";
 export interface ModificationProcess {
     approve(): void;
     revert(): void;
@@ -8,12 +8,15 @@ export declare class BoxEditing implements Editing {
     #private;
     constructor(graph: BoxGraph);
     get graph(): BoxGraph;
+    subscribe(observer: Observer<void>): Subscription;
     markSaved(): void;
     hasUnsavedChanges(): boolean;
     isEmpty(): boolean;
     clear(): void;
     undo(): boolean;
     redo(): boolean;
+    canUndo(): boolean;
+    canRedo(): boolean;
     mustModify(): boolean;
     modify<R>(modifier: SyncProvider<Maybe<R>>, mark?: boolean): Option<R>;
     beginModification(): ModificationProcess;

package/dist/editing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editing.d.ts","sourceRoot":"","sources":["../src/editing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAA;AAChC,OAAO,EAAiB,OAAO,EAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAC,MAAM,kBAAkB,CAAA;AAqB1F,MAAM,WAAW,mBAAmB;IAChC,OAAO,IAAI,IAAI,CAAA;IACf,MAAM,IAAI,IAAI,CAAA;CACjB;AAED,qBAAa,UAAW,YAAW,OAAO;;gBAW1B,KAAK,EAAE,QAAQ;IAI3B,IAAI,KAAK,IAAI,QAAQ,CAAqB;IAE1C,SAAS,IAAI,IAAI;IAKjB,iBAAiB,IAAI,OAAO;IAM5B,OAAO,IAAI,OAAO;IAElB,KAAK,IAAI,IAAI;IAQb,IAAI,IAAI,OAAO;IAUf,IAAI,IAAI,OAAO;IAcf,UAAU,IAAI,OAAO;IAErB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,GAAE,OAAc,GAAG,MAAM,CAAC,CAAC,CAAC;IAyB5E,iBAAiB,IAAI,mBAAmB;IAkCxC,IAAI,IAAI,IAAI;IAYZ,YAAY,IAAI,IAAI;IAMpB,OAAO,IAAI,IAAI;CAGlB"}
+{"version":3,"file":"editing.d.ts","sourceRoot":"","sources":["../src/editing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAA;AAChC,OAAO,EAGH,OAAO,EAEP,KAAK,EAEL,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,YAAY,EACf,MAAM,kBAAkB,CAAA;AAqBzB,MAAM,WAAW,mBAAmB;IAChC,OAAO,IAAI,IAAI,CAAA;IACf,MAAM,IAAI,IAAI,CAAA;CACjB;AAED,qBAAa,UAAW,YAAW,OAAO;;gBAY1B,KAAK,EAAE,QAAQ;IAM3B,IAAI,KAAK,IAAI,QAAQ,CAAqB;IAE1C,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,YAAY;IAIjD,SAAS,IAAI,IAAI;IAKjB,iBAAiB,IAAI,OAAO;IAM5B,OAAO,IAAI,OAAO;IAElB,KAAK,IAAI,IAAI;IASb,IAAI,IAAI,OAAO;IAWf,IAAI,IAAI,OAAO;IASf,OAAO,IAAI,OAAO;IAKlB,OAAO,IAAI,OAAO;IAkBlB,UAAU,IAAI,OAAO;IAErB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,GAAE,OAAc,GAAG,MAAM,CAAC,CAAC,CAAC;IA2B5E,iBAAiB,IAAI,mBAAmB;IAmCxC,IAAI,IAAI,IAAI;IAYZ,YAAY,IAAI,IAAI;IAOpB,OAAO,IAAI,IAAI;CAGlB"}

package/dist/editing.js

@@ -1,4 +1,4 @@
-import { Arrays, assert, Option } from "@opendaw/lib-std";
+import { Arrays, assert, Notifier, Option } from "@opendaw/lib-std";
 class Modification {
     #updates;
     constructor(updates) { this.#updates = updates; }
@@ -17,6 +17,7 @@ export class BoxEditing {
     #graph;
     #pending = [];
     #marked = [];
+    #notifier;
     #modifying = false;
     #inProcess = false;
     #disabled = false;
@@ -24,8 +25,12 @@ export class BoxEditing {
     #savedHistoryIndex = 0; // -1 = saved state was spliced away, >= 0 = valid saved position
     constructor(graph) {
         this.#graph = graph;
+        this.#notifier = new Notifier();
     }
     get graph() { return this.#graph; }
+    subscribe(observer) {
+        return this.#notifier.subscribe(observer);
+    }
     markSaved() {
         if (this.#pending.length > 0) {
             this.mark();
@@ -48,44 +53,65 @@ export class BoxEditing {
         Arrays.clear(this.#marked);
         this.#historyIndex = 0;
         this.#savedHistoryIndex = 0;
+        this.#notifier.notify();
     }
     undo() {
-        if (this.#disabled) {
+        if (!this.canUndo()) {
             return false;
         }
         if (this.#pending.length > 0) {
             this.mark();
         }
-        if (this.#historyIndex === 0) {
-            return false;
-        }
+        console.debug("undo");
         const modifications = this.#marked[--this.#historyIndex];
         modifications.toReversed().forEach(step => step.inverse(this.#graph));
         this.#graph.edges().validateRequirements();
+        this.#notifier.notify();
         return true;
     }
     redo() {
+        if (!this.canRedo()) {
+            return false;
+        }
+        console.debug("redo");
+        this.#marked[this.#historyIndex++].forEach(step => step.forward(this.#graph));
+        this.#graph.edges().validateRequirements();
+        this.#notifier.notify();
+        return true;
+    }
+    canUndo() {
         if (this.#disabled) {
             return false;
         }
-        if (this.#historyIndex === this.#marked.length) {
+        return this.#historyIndex !== 0 || this.#pending.length > 0;
+    }
+    canRedo() {
+        if (this.#disabled) {
             return false;
         }
-        if (this.#pending.length > 0) {
-            console.warn("redo while having pending updates?");
+        if (this.#historyIndex === this.#marked.length) {
             return false;
         }
-        this.#marked[this.#historyIndex++].forEach(step => step.forward(this.#graph));
-        this.#graph.edges().validateRequirements();
-        return true;
+        return this.#pending.length <= 0;
     }
-    // TODO This is an option to clarify, if user actions meant to be run by a modifier or not.
-    //  See ParameterWrapper. Not the nicest solution. Probably coming back to this sooner or later.
+    // TODO This method exists to handle bidirectional sync between UI state and Box state.
+    //  Problem: When a Box field changes (e.g., during undo/redo), reactive subscriptions may fire
+    //  and attempt to call modify() to sync the UI state back to the Box. But since undo/redo
+    //  already has a transaction open (via Modification.inverse/forward calling beginTransaction
+    //  directly), calling modify() would fail with "Transaction already in progress".
+    //  Current workaround: Callers check mustModify() before calling modify(). If false (transaction
+    //  already open), they either skip the call or call setValue directly without recording history.
+    //  See: EditWrapper.forValue, EditWrapper.forAutomatableParameter, TransportGroup loop sync.
+    //  Better solution: Consider having Modification.inverse/forward use the same #modifying flag
+    //  as modify(), or introduce a unified "modification context" that both undo/redo and user
+    //  actions share. This would allow modify() to detect it's being called reactively during
+    //  undo/redo and handle it internally, rather than requiring all callers to guard with mustModify().
     mustModify() { return !this.#graph.inTransaction(); }
     modify(modifier, mark = true) {
         assert(!this.#inProcess, "Cannot call modify while a modification process is running");
         if (this.#modifying) {
             // Nested modify call - just execute without separate recording
+            this.#notifier.notify();
             return Option.wrap(modifier());
         }
         if (mark && this.#pending.length > 0) {
@@ -108,6 +134,7 @@ export class BoxEditing {
         if (mark) {
             this.mark();
         }
+        this.#notifier.notify();
         return Option.wrap(result);
     }
     beginModification() {
@@ -130,6 +157,7 @@ export class BoxEditing {
                 this.#inProcess = false;
                 this.#graph.edges().validateRequirements();
                 this.mark();
+                this.#notifier.notify();
             },
             revert: () => {
                 this.#graph.endTransaction();
@@ -162,6 +190,7 @@ export class BoxEditing {
         }
         this.#pending.reverse().forEach(modification => modification.inverse(this.#graph));
         this.#pending.length = 0;
+        this.#notifier.notify();
     }
     disable() {
         this.#disabled = true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opendaw/lib-box",
-    "version": "0.0.63",
+    "version": "0.0.64",
     "sideEffects": false,
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -23,12 +23,12 @@
         "test": "vitest run"
     },
     "dependencies": {
-        "@opendaw/lib-runtime": "^0.0.62",
-        "@opendaw/lib-std": "^0.0.62"
+        "@opendaw/lib-runtime": "^0.0.63",
+        "@opendaw/lib-std": "^0.0.63"
     },
     "devDependencies": {
         "@opendaw/eslint-config": "^0.0.27",
         "@opendaw/typescript-config": "^0.0.28"
     },
-    "gitHead": "100e759378d7150e6eb7165232d8c4a1fbb77bbc"
+    "gitHead": "db2b1bd172607177fef63077c2eed9b7cbec167f"
 }