@flowgram.ai/variable-core 0.3.2 → 0.3.4

package/dist/index.d.mts

@@ -32,6 +32,7 @@ declare class ScopeOutputData {
     };
     get variableEngine(): VariableEngine;
     get globalVariableTable(): IVariableTable;
+    get version(): number;
     /**
      * @deprecated use onListOrAnyVarChange instead
      */
@@ -77,8 +78,11 @@ declare class ScopeAvailableData {
         clear: (key?: string | symbol) => void;
     };
     get globalVariableTable(): IVariableTable;
+    protected _version: number;
     protected refresh$: Subject<void>;
     protected _variables: VariableDeclaration[];
+    get version(): number;
+    protected bumpVersion(): void;
     refresh(): void;
     /**
      * 监听
@@ -133,9 +137,7 @@ declare class ScopeAvailableData {
      * Track Variable Change (Includes type update and children update) By KeyPath
      * @returns
      */
-    trackByKeyPath(keyPath: string[] | undefined, cb: (variable?: BaseVariableField | undefined) => void, opts?: {
-        triggerOnInit?: boolean;
-    }): Disposable;
+    trackByKeyPath<Data = BaseVariableField | undefined>(keyPath: string[] | undefined, cb: (variable?: Data) => void, opts?: SubscribeConfig<BaseVariableField | undefined, Data>): Disposable;
 }
 
 /**

package/dist/index.d.ts

@@ -32,6 +32,7 @@ declare class ScopeOutputData {
     };
     get variableEngine(): VariableEngine;
     get globalVariableTable(): IVariableTable;
+    get version(): number;
     /**
      * @deprecated use onListOrAnyVarChange instead
      */
@@ -77,8 +78,11 @@ declare class ScopeAvailableData {
         clear: (key?: string | symbol) => void;
     };
     get globalVariableTable(): IVariableTable;
+    protected _version: number;
     protected refresh$: Subject<void>;
     protected _variables: VariableDeclaration[];
+    get version(): number;
+    protected bumpVersion(): void;
     refresh(): void;
     /**
      * 监听
@@ -133,9 +137,7 @@ declare class ScopeAvailableData {
      * Track Variable Change (Includes type update and children update) By KeyPath
      * @returns
      */
-    trackByKeyPath(keyPath: string[] | undefined, cb: (variable?: BaseVariableField | undefined) => void, opts?: {
-        triggerOnInit?: boolean;
-    }): Disposable;
+    trackByKeyPath<Data = BaseVariableField | undefined>(keyPath: string[] | undefined, cb: (variable?: Data) => void, opts?: SubscribeConfig<BaseVariableField | undefined, Data>): Disposable;
 }
 
 /**

package/dist/index.js

@@ -119,6 +119,9 @@ var VariableTable = class {
     this.parentTable = parentTable;
     this.table = /* @__PURE__ */ new Map();
     this.toDispose = new import_utils2.DisposableCollection();
+    /**
+     * @deprecated
+     */
     this.onDataChangeEmitter = new import_utils2.Emitter();
     this.variables$ = new import_rxjs.Subject();
     // 监听变量列表中的单个变量变化
@@ -143,7 +146,9 @@ var VariableTable = class {
     this.toDispose.pushAll([
       this.onDataChangeEmitter,
       // active share()
-      this.onAnyVariableChange(() => null)
+      this.onAnyVariableChange(() => {
+        this.bumpVersion();
+      })
     ]);
   }
   /**
@@ -172,7 +177,7 @@ var VariableTable = class {
     return disposables;
   }
   fireChange() {
-    this._version++;
+    this.bumpVersion();
     this.onDataChangeEmitter.fire();
     this.variables$.next(this.variables);
     this.parentTable?.fireChange();
@@ -180,6 +185,12 @@ var VariableTable = class {
   get version() {
     return this._version;
   }
+  bumpVersion() {
+    this._version = this._version + 1;
+    if (this._version === Number.MAX_SAFE_INTEGER) {
+      this._version = 0;
+    }
+  }
   get variables() {
     return Array.from(this.table.values());
   }
@@ -1668,6 +1679,9 @@ var ScopeOutputData = class {
   get globalVariableTable() {
     return this.scope.variableEngine.globalVariableTable;
   }
+  get version() {
+    return this.variableTable.version;
+  }
   /**
    * @deprecated use onListOrAnyVarChange instead
    */
@@ -1739,6 +1753,7 @@ var ScopeAvailableData = class {
   constructor(scope) {
     this.scope = scope;
     this.memo = createMemo();
+    this._version = 0;
     this.refresh$ = new import_rxjs4.Subject();
     this._variables = [];
     /**
@@ -1783,10 +1798,12 @@ var ScopeAvailableData = class {
         this._variables = _variables;
         this.memo.clear();
         this.onDataChangeEmitter.fire(this._variables);
+        this.bumpVersion();
         this.onListOrAnyVarChangeEmitter.fire(this._variables);
       }),
       this.onAnyVariableChange(() => {
         this.onDataChangeEmitter.fire(this._variables);
+        this.bumpVersion();
         this.onListOrAnyVarChangeEmitter.fire(this._variables);
       }),
       import_utils5.Disposable.create(() => {
@@ -1798,6 +1815,15 @@ var ScopeAvailableData = class {
   get globalVariableTable() {
     return this.scope.variableEngine.globalVariableTable;
   }
+  get version() {
+    return this._version;
+  }
+  bumpVersion() {
+    this._version = this._version + 1;
+    if (this._version === Number.MAX_SAFE_INTEGER) {
+      this._version = 0;
+    }
+  }
   // 刷新可访问变量列表
   refresh() {
     if (this.scope.disposed) {
@@ -1855,16 +1881,25 @@ var ScopeAvailableData = class {
    * @returns
    */
   trackByKeyPath(keyPath = [], cb, opts) {
-    const { triggerOnInit = true } = opts || {};
+    const { triggerOnInit = true, debounceAnimation, selector } = opts || {};
     return subsToDisposable(
       (0, import_rxjs4.merge)(this.anyVariableChange$, this.variables$).pipe(
         triggerOnInit ? (0, import_rxjs4.startWith)() : (0, import_rxjs4.tap)(() => null),
         (0, import_rxjs4.map)(() => {
           const v = this.getByKeyPath(keyPath);
-          return { v, hash: v?.hash };
+          return selector ? selector(v) : v;
         }),
-        (0, import_rxjs4.distinctUntilKeyChanged)("hash"),
-        (0, import_rxjs4.map)(({ v }) => v)
+        (0, import_rxjs4.distinctUntilChanged)(
+          (a, b) => (0, import_fast_equals7.shallowEqual)(a, b),
+          (value) => {
+            if (value instanceof ASTNode) {
+              return value.hash;
+            }
+            return value;
+          }
+        ),
+        // 每个 animationFrame 内所有更新合并成一个
+        debounceAnimation ? (0, import_rxjs4.debounceTime)(0, import_rxjs4.animationFrameScheduler) : (0, import_rxjs4.tap)(() => null)
       ).subscribe(cb)
     );
   }