@knotx/plugins-history 0.2.7 → 0.2.9

package/dist/index.cjs

@@ -83,6 +83,8 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
     __publicField(this, "isUndoRedo", false);
     __publicField(this, "maxHistory");
     __publicField(this, "tagMap", /* @__PURE__ */ new Map());
+    __publicField(this, "operationBuffer", {});
+    __publicField(this, "operations$", new rxjs.Subject());
     __publicField(this, "canUndo", __runInitializers(_init, 8, this, false)), __runInitializers(_init, 11, this);
     __publicField(this, "canRedo", __runInitializers(_init, 12, this, false)), __runInitializers(_init, 15, this);
     __publicField(this, "ref", __runInitializers(_init, 16, this, this)), __runInitializers(_init, 19, this);
@@ -99,14 +101,28 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
     __publicField(this, "edgesManager", __runInitializers(_init, 28, this)), __runInitializers(_init, 31, this);
     __publicField(this, "dataManagers", /* @__PURE__ */ new Map());
   }
-  init(config) {
-    var _a2;
+  init(config = {}) {
+    var _a2, _b;
     this.maxHistory = (_a2 = config.maxHistory) != null ? _a2 : 50;
+    const debounceTimeConfig = (_b = config.debounceTime) != null ? _b : 20;
     this.dataManagers.set(this.nodesManager.tag, this.nodesManager);
     this.dataManagers.set(this.edgesManager.tag, this.edgesManager);
     this.dataManagers.forEach((dataManager) => {
       this.addOperationPipe(dataManager);
     });
+    this.subscriptions.push(
+      this.operations$.pipe(
+        rxjs.tap(([tag, operation]) => {
+          if (!this.operationBuffer[tag]) {
+            this.operationBuffer[tag] = [];
+          }
+          this.operationBuffer[tag].push(operation);
+        }),
+        rxjs.debounceTime(debounceTimeConfig)
+      ).subscribe(() => {
+        this.flushOperationBuffer();
+      })
+    );
   }
   destroy() {
     this.dataManagers.clear();
@@ -121,17 +137,22 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
           }
           if (!this.isUndoRedo) {
             const enrichedOperation = this.enrichOperation(dataManager, operation);
-            this.pushHistory({
-              value: {
-                [dataManager.tag]: [enrichedOperation]
-              },
-              timestamp: Date.now()
-            });
+            this.operations$.next([dataManager.tag, enrichedOperation]);
           }
         })
       )
     });
   }
+  flushOperationBuffer() {
+    if (Object.keys(this.operationBuffer).length === 0) {
+      return;
+    }
+    this.pushHistory({
+      value: __spreadValues({}, this.operationBuffer),
+      timestamp: Date.now()
+    });
+    this.operationBuffer = {};
+  }
   enrichOperation(dataManager, operation) {
     switch (operation.type) {
       case "update": {
@@ -177,6 +198,7 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
   undo() {
     if (!this.canUndo)
       return;
+    this.flushOperationBufferImmediately();
     const state = this.history[this.currentIndex];
     this.isUndoRedo = true;
     try {
@@ -184,10 +206,13 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
         const dataManager = this.dataManagers.get(key);
         if (!dataManager)
           return;
-        this.reverseOperation(dataManager, {
+        const reverseOperations = this.reverseOperation({
           type: "batch",
           operations: core.flattenOperations(operations)
         });
+        if (reverseOperations) {
+          dataManager.dispatch(reverseOperations);
+        }
       });
       this.currentIndex--;
       this.updateCanUndoRedo();
@@ -198,6 +223,7 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
   redo() {
     if (!this.canRedo)
       return;
+    this.flushOperationBufferImmediately();
     this.currentIndex++;
     const state = this.history[this.currentIndex];
     this.isUndoRedo = true;
@@ -217,12 +243,14 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
     }
   }
   addTag(tag) {
+    this.flushOperationBufferImmediately();
     this.tagMap.set(tag, this.history[this.currentIndex]);
   }
   removeTag(tag) {
     this.tagMap.delete(tag);
   }
   toTag(tag) {
+    this.flushOperationBufferImmediately();
     const tagIndex = this.ensureTagIndex(tag);
     if (tagIndex === false) {
       return;
@@ -259,30 +287,50 @@ class History extends (_a = core.BasePlugin, _canUndo_dec = [decorators.register
     }
     return stateIndex;
   }
-  reverseOperation(dataManager, operation) {
+  reverseOperation(operation) {
     switch (operation.type) {
       case "add":
-        dataManager.dispatch({ type: "remove", id: operation.data.id });
-        break;
+        return { type: "remove", id: operation.data.id };
       case "remove":
         if (operation.removedNode) {
-          dataManager.dispatch({ type: "add", data: operation.removedNode });
+          return { type: "add", data: operation.removedNode };
         }
         break;
       case "update":
         if (operation.originalData) {
-          dataManager.dispatch({
+          return {
             type: "update",
             id: operation.id,
             data: operation.originalData
-          });
+          };
         }
         break;
-      case "batch":
-        operation.operations.reverse().forEach((op) => this.reverseOperation(dataManager, op));
-        break;
+      case "batch": {
+        const operations = [];
+        for (const op of operation.operations.reverse()) {
+          const reverseOperation = this.reverseOperation(op);
+          if (reverseOperation) {
+            operations.push(reverseOperation);
+          }
+        }
+        if (operations.length > 0) {
+          return {
+            type: "batch",
+            operations
+          };
+        }
+        return void 0;
+      }
+      default:
+        return void 0;
     }
   }
+  /**
+   * 立即处理操作缓冲区，不等待 debounce
+   */
+  flushOperationBufferImmediately() {
+    this.flushOperationBuffer();
+  }
 }
 _init = __decoratorStart(_a);
 __decorateElement(_init, 1, "init", _init_dec, History);

package/dist/index.d.cts

@@ -18,16 +18,18 @@ interface IHistory {
     toTag: (tag: string) => void;
     clearTags: () => void;
 }
+type HistoryOperation<T extends Record<string, IData>> = DataOperation<T[keyof T]> & {
+    originalData?: Partial<T[keyof T]>;
+};
 interface HistoryState<T extends Record<string, IData> = Record<string, any>> {
     value: {
-        [key: string]: Array<DataOperation<T[keyof T]> & {
-            originalData?: Partial<T[keyof T]>;
-        }>;
+        [key: string]: HistoryOperation<T>[];
     };
     timestamp: number;
 }
 interface HistoryConfig {
     maxHistory?: number;
+    debounceTime?: number;
 }
 declare class History<T extends Record<string, IData> = Record<string, any>> extends BasePlugin<'history', HistoryConfig> {
     name: "history";
@@ -36,6 +38,8 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private isUndoRedo;
     private maxHistory;
     private tagMap;
+    private operationBuffer;
+    private operations$;
     canUndo: boolean;
     canRedo: boolean;
     ref: this;
@@ -43,9 +47,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private nodesManager;
     private edgesManager;
     private dataManagers;
-    init(config: HistoryConfig): void;
+    init(config?: HistoryConfig): void;
     destroy(): void;
     private addOperationPipe;
+    private flushOperationBuffer;
     private enrichOperation;
     private pushHistory;
     private updateCanUndoRedo;
@@ -57,6 +62,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     clearTags(): void;
     private ensureTagIndex;
     private reverseOperation;
+    /**
+     * 立即处理操作缓冲区，不等待 debounce
+     */
+    private flushOperationBufferImmediately;
 }
 
-export { History, type HistoryConfig, type HistoryState, type IHistory };
+export { History, type HistoryConfig, type HistoryOperation, type HistoryState, type IHistory };

package/dist/index.d.mts

@@ -18,16 +18,18 @@ interface IHistory {
     toTag: (tag: string) => void;
     clearTags: () => void;
 }
+type HistoryOperation<T extends Record<string, IData>> = DataOperation<T[keyof T]> & {
+    originalData?: Partial<T[keyof T]>;
+};
 interface HistoryState<T extends Record<string, IData> = Record<string, any>> {
     value: {
-        [key: string]: Array<DataOperation<T[keyof T]> & {
-            originalData?: Partial<T[keyof T]>;
-        }>;
+        [key: string]: HistoryOperation<T>[];
     };
     timestamp: number;
 }
 interface HistoryConfig {
     maxHistory?: number;
+    debounceTime?: number;
 }
 declare class History<T extends Record<string, IData> = Record<string, any>> extends BasePlugin<'history', HistoryConfig> {
     name: "history";
@@ -36,6 +38,8 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private isUndoRedo;
     private maxHistory;
     private tagMap;
+    private operationBuffer;
+    private operations$;
     canUndo: boolean;
     canRedo: boolean;
     ref: this;
@@ -43,9 +47,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private nodesManager;
     private edgesManager;
     private dataManagers;
-    init(config: HistoryConfig): void;
+    init(config?: HistoryConfig): void;
     destroy(): void;
     private addOperationPipe;
+    private flushOperationBuffer;
     private enrichOperation;
     private pushHistory;
     private updateCanUndoRedo;
@@ -57,6 +62,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     clearTags(): void;
     private ensureTagIndex;
     private reverseOperation;
+    /**
+     * 立即处理操作缓冲区，不等待 debounce
+     */
+    private flushOperationBufferImmediately;
 }
 
-export { History, type HistoryConfig, type HistoryState, type IHistory };
+export { History, type HistoryConfig, type HistoryOperation, type HistoryState, type IHistory };

package/dist/index.d.ts

@@ -18,16 +18,18 @@ interface IHistory {
     toTag: (tag: string) => void;
     clearTags: () => void;
 }
+type HistoryOperation<T extends Record<string, IData>> = DataOperation<T[keyof T]> & {
+    originalData?: Partial<T[keyof T]>;
+};
 interface HistoryState<T extends Record<string, IData> = Record<string, any>> {
     value: {
-        [key: string]: Array<DataOperation<T[keyof T]> & {
-            originalData?: Partial<T[keyof T]>;
-        }>;
+        [key: string]: HistoryOperation<T>[];
     };
     timestamp: number;
 }
 interface HistoryConfig {
     maxHistory?: number;
+    debounceTime?: number;
 }
 declare class History<T extends Record<string, IData> = Record<string, any>> extends BasePlugin<'history', HistoryConfig> {
     name: "history";
@@ -36,6 +38,8 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private isUndoRedo;
     private maxHistory;
     private tagMap;
+    private operationBuffer;
+    private operations$;
     canUndo: boolean;
     canRedo: boolean;
     ref: this;
@@ -43,9 +47,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     private nodesManager;
     private edgesManager;
     private dataManagers;
-    init(config: HistoryConfig): void;
+    init(config?: HistoryConfig): void;
     destroy(): void;
     private addOperationPipe;
+    private flushOperationBuffer;
     private enrichOperation;
     private pushHistory;
     private updateCanUndoRedo;
@@ -57,6 +62,10 @@ declare class History<T extends Record<string, IData> = Record<string, any>> ext
     clearTags(): void;
     private ensureTagIndex;
     private reverseOperation;
+    /**
+     * 立即处理操作缓冲区，不等待 debounce
+     */
+    private flushOperationBufferImmediately;
 }
 
-export { History, type HistoryConfig, type HistoryState, type IHistory };
+export { History, type HistoryConfig, type HistoryOperation, type HistoryState, type IHistory };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { isDraftOperation, isInitOperation, flattenOperations, BasePlugin } from '@knotx/core';
 import { register, inject, OnInit, OnDestroy } from '@knotx/decorators';
-import { pipe, tap } from 'rxjs';
+import { Subject, tap, debounceTime, pipe } from 'rxjs';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -81,6 +81,8 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
     __publicField(this, "isUndoRedo", false);
     __publicField(this, "maxHistory");
     __publicField(this, "tagMap", /* @__PURE__ */ new Map());
+    __publicField(this, "operationBuffer", {});
+    __publicField(this, "operations$", new Subject());
     __publicField(this, "canUndo", __runInitializers(_init, 8, this, false)), __runInitializers(_init, 11, this);
     __publicField(this, "canRedo", __runInitializers(_init, 12, this, false)), __runInitializers(_init, 15, this);
     __publicField(this, "ref", __runInitializers(_init, 16, this, this)), __runInitializers(_init, 19, this);
@@ -97,14 +99,28 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
     __publicField(this, "edgesManager", __runInitializers(_init, 28, this)), __runInitializers(_init, 31, this);
     __publicField(this, "dataManagers", /* @__PURE__ */ new Map());
   }
-  init(config) {
-    var _a2;
+  init(config = {}) {
+    var _a2, _b;
     this.maxHistory = (_a2 = config.maxHistory) != null ? _a2 : 50;
+    const debounceTimeConfig = (_b = config.debounceTime) != null ? _b : 20;
     this.dataManagers.set(this.nodesManager.tag, this.nodesManager);
     this.dataManagers.set(this.edgesManager.tag, this.edgesManager);
     this.dataManagers.forEach((dataManager) => {
       this.addOperationPipe(dataManager);
     });
+    this.subscriptions.push(
+      this.operations$.pipe(
+        tap(([tag, operation]) => {
+          if (!this.operationBuffer[tag]) {
+            this.operationBuffer[tag] = [];
+          }
+          this.operationBuffer[tag].push(operation);
+        }),
+        debounceTime(debounceTimeConfig)
+      ).subscribe(() => {
+        this.flushOperationBuffer();
+      })
+    );
   }
   destroy() {
     this.dataManagers.clear();
@@ -119,17 +135,22 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
           }
           if (!this.isUndoRedo) {
             const enrichedOperation = this.enrichOperation(dataManager, operation);
-            this.pushHistory({
-              value: {
-                [dataManager.tag]: [enrichedOperation]
-              },
-              timestamp: Date.now()
-            });
+            this.operations$.next([dataManager.tag, enrichedOperation]);
           }
         })
       )
     });
   }
+  flushOperationBuffer() {
+    if (Object.keys(this.operationBuffer).length === 0) {
+      return;
+    }
+    this.pushHistory({
+      value: __spreadValues({}, this.operationBuffer),
+      timestamp: Date.now()
+    });
+    this.operationBuffer = {};
+  }
   enrichOperation(dataManager, operation) {
     switch (operation.type) {
       case "update": {
@@ -175,6 +196,7 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
   undo() {
     if (!this.canUndo)
       return;
+    this.flushOperationBufferImmediately();
     const state = this.history[this.currentIndex];
     this.isUndoRedo = true;
     try {
@@ -182,10 +204,13 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
         const dataManager = this.dataManagers.get(key);
         if (!dataManager)
           return;
-        this.reverseOperation(dataManager, {
+        const reverseOperations = this.reverseOperation({
           type: "batch",
           operations: flattenOperations(operations)
         });
+        if (reverseOperations) {
+          dataManager.dispatch(reverseOperations);
+        }
       });
       this.currentIndex--;
       this.updateCanUndoRedo();
@@ -196,6 +221,7 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
   redo() {
     if (!this.canRedo)
       return;
+    this.flushOperationBufferImmediately();
     this.currentIndex++;
     const state = this.history[this.currentIndex];
     this.isUndoRedo = true;
@@ -215,12 +241,14 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
     }
   }
   addTag(tag) {
+    this.flushOperationBufferImmediately();
     this.tagMap.set(tag, this.history[this.currentIndex]);
   }
   removeTag(tag) {
     this.tagMap.delete(tag);
   }
   toTag(tag) {
+    this.flushOperationBufferImmediately();
     const tagIndex = this.ensureTagIndex(tag);
     if (tagIndex === false) {
       return;
@@ -257,30 +285,50 @@ class History extends (_a = BasePlugin, _canUndo_dec = [register("canUndo")], _c
     }
     return stateIndex;
   }
-  reverseOperation(dataManager, operation) {
+  reverseOperation(operation) {
     switch (operation.type) {
       case "add":
-        dataManager.dispatch({ type: "remove", id: operation.data.id });
-        break;
+        return { type: "remove", id: operation.data.id };
       case "remove":
         if (operation.removedNode) {
-          dataManager.dispatch({ type: "add", data: operation.removedNode });
+          return { type: "add", data: operation.removedNode };
         }
         break;
       case "update":
         if (operation.originalData) {
-          dataManager.dispatch({
+          return {
             type: "update",
             id: operation.id,
             data: operation.originalData
-          });
+          };
         }
         break;
-      case "batch":
-        operation.operations.reverse().forEach((op) => this.reverseOperation(dataManager, op));
-        break;
+      case "batch": {
+        const operations = [];
+        for (const op of operation.operations.reverse()) {
+          const reverseOperation = this.reverseOperation(op);
+          if (reverseOperation) {
+            operations.push(reverseOperation);
+          }
+        }
+        if (operations.length > 0) {
+          return {
+            type: "batch",
+            operations
+          };
+        }
+        return void 0;
+      }
+      default:
+        return void 0;
     }
   }
+  /**
+   * 立即处理操作缓冲区，不等待 debounce
+   */
+  flushOperationBufferImmediately() {
+    this.flushOperationBuffer();
+  }
 }
 _init = __decoratorStart(_a);
 __decorateElement(_init, 1, "init", _init_dec, History);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knotx/plugins-history",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "History Plugin for Knotx",
   "author": "boenfu",
   "license": "MIT",
@@ -29,13 +29,13 @@
   ],
   "dependencies": {
     "rxjs": "^7.8.1",
-    "@knotx/core": "0.2.6",
-    "@knotx/decorators": "0.2.6"
+    "@knotx/decorators": "0.2.7",
+    "@knotx/core": "0.2.7"
   },
   "devDependencies": {
-    "@knotx/build-config": "0.2.6",
-    "@knotx/eslint-config": "0.2.6",
-    "@knotx/typescript-config": "0.2.6"
+    "@knotx/eslint-config": "0.2.7",
+    "@knotx/typescript-config": "0.2.7",
+    "@knotx/build-config": "0.2.7"
   },
   "scripts": {
     "build": "unbuild",