cache开启和关闭事务机制的再整理

es/features/cache.d.ts

@@ -119,7 +119,7 @@ export declare class Cache<ED extends EntityDict & BaseEntityDict, Cxt extends A
     unbindOnSync(callback: (opRecords: OpRecord<ED>[]) => void): void;
     getCachedData(): { [T in keyof ED]?: ED[T]["OpSchema"][] | undefined; };
     getFullData(): any;
-    begin(): FrontCxt;
+    begin(allowExists?: boolean): FrontCxt | undefined;
     commit(): void;
     rollback(): void;
     getContext(): FrontCxt;

es/features/cache.js

@@ -486,8 +486,13 @@ export class Cache extends Feature {
     getFullData() {
         return this.getFullDataFn();
     }
-    begin() {
+    begin(allowExists) {
-        assert(!this.context);
+        if (this.context) {
+            if (allowExists) {
+                return;
+            }
+            assert(false);
+        }
         this.context = this.contextBuilder();
         this.context.begin();
         return this.context;

es/features/contextMenuFactory.js

@@ -74,7 +74,8 @@ export class ContextMenuFactory extends Feature {
     }
     getMenusByContext(entity, entityId) {
         assert(this.menus, '应当先调用setMenus才能动态判定菜单');
-        this.cache.begin();
+        const needRollback = !!this.cache.begin(true);
+        try {
             const menus = this.menus
                 .filter((menu) => {
                 const { entity: destEntity, paths, action } = menu;
@@ -135,7 +136,12 @@ export class ContextMenuFactory extends Feature {
                 return false;
             })
                 .map((wrapper) => omit(wrapper, ['filtersMaker']));
-        this.cache.rollback();
+            needRollback && this.cache.rollback();
             return menus;
         }
+        catch (err) {
+            needRollback && this.cache.rollback();
+            throw err;
+        }
+    }
 }

es/features/runningTree.d.ts

@@ -249,8 +249,7 @@ export declare class RunningTree<ED extends EntityDict & BaseEntityDict, Cxt ext
     checkIsModiNode(path: string): boolean;
     private findNode;
     destroyNode(path: string): void;
-    redoBranchOperations(path: string): void;
+    redoBranchOperations(path: string): () => void;
-    rollbackRedoBranchOperations(): void;
     getFreshValue(path: string): Partial<ED[keyof ED]["Schema"]> | Partial<ED[keyof ED]["Schema"]>[] | undefined;
     isDirty(path: string): boolean;
     addItem<T extends keyof ED>(path: string, data: Omit<ED[T]['CreateSingle']['data'], 'id'> & {

es/features/runningTree.js

@@ -1656,7 +1656,8 @@ export class RunningTree extends Feature {
         const paths = path.split('.');
         const root = this.root[paths[0]];
         const opers = root.composeOperations();
-        this.cache.begin();
+        const cxt = this.cache.begin();
+        if (cxt) {
             if (opers) {
                 this.cache.redoOperation(opers);
             }
@@ -1665,9 +1666,9 @@ export class RunningTree extends Feature {
                 const modiOperations = (root instanceof SingleNode || root instanceof VirtualNode) && root.getModiOperations();
                 modiOperations && this.cache.redoOperation(modiOperations);
             }
+            return () => this.cache.rollback();
         }
-    rollbackRedoBranchOperations() {
+        return () => undefined;
-        this.cache.rollback();
     }
     getFreshValue(path) {
         const node = this.findNode(path);

es/page.common.js

@@ -405,7 +405,7 @@ export function reRender(option, extra) {
     const localeState = features.locales.getState();
     if (this.state.oakEntity && this.state.oakFullpath) {
         // 现在取数据需要把runningTree上的更新应用了再取，判定actions也一样
-        this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
+        const cleanFn = this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
         try {
             const rows = this.features.runningTree.getFreshValue(this.state.oakFullpath);
             const oakLegalActions = rows && checkActionsAndCascadeEntities.call(this, rows, option);
@@ -459,10 +459,10 @@ export function reRender(option, extra) {
                 Object.assign(data, extra);
             }
             this.setState(data);
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
         }
         catch (err) {
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             throw err;
         }
     }

es/page.mp.js

@@ -188,10 +188,16 @@ const oakBehavior = Behavior({
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
+                cleanFn();
                 return value;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
         checkOperation(entity, { action, data, filter }, checkerTypes) {
             if (checkerTypes?.includes('relation')) {
@@ -459,11 +465,17 @@ const oakBehavior = Behavior({
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
                 assert(!(value instanceof Array));
+                cleanFn();
                 return value?.$$createAt$$ === 1;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
         async aggregate(aggregation) {
             return await this.features.cache.aggregate(this.state.oakEntity, aggregation);

es/page.react.js

@@ -151,12 +151,18 @@ class OakComponentBase extends React.PureComponent {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
-        this.features.runningTree.redoBranchOperations(path2);
+        const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+        try {
             const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
             assert(!(value instanceof Array));
+            cleanFn();
             return value?.$$createAt$$ === 1;
         }
+        catch (err) {
+            cleanFn();
+            throw err;
+        }
+    }
     clean(path) {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
@@ -176,11 +182,17 @@ class OakComponentBase extends React.PureComponent {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
-        this.features.runningTree.redoBranchOperations(path2);
+        const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+        try {
             const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             return value;
         }
+        catch (err) {
+            cleanFn();
+            throw err;
+        }
+    }
     checkOperation(entity, operation, checkerTypes) {
         if (checkerTypes?.includes('relation')) {
             return this.features.relationAuth.checkRelation(entity, operation) && this.features.cache.checkOperation(entity, operation, checkerTypes);

lib/features/cache.d.ts

@@ -119,7 +119,7 @@ export declare class Cache<ED extends EntityDict & BaseEntityDict, Cxt extends A
     unbindOnSync(callback: (opRecords: OpRecord<ED>[]) => void): void;
     getCachedData(): { [T in keyof ED]?: ED[T]["OpSchema"][] | undefined; };
     getFullData(): any;
-    begin(): FrontCxt;
+    begin(allowExists?: boolean): FrontCxt | undefined;
     commit(): void;
     rollback(): void;
     getContext(): FrontCxt;

lib/features/cache.js

@@ -489,8 +489,13 @@ class Cache extends Feature_1.Feature {
     getFullData() {
         return this.getFullDataFn();
     }
-    begin() {
+    begin(allowExists) {
-        (0, assert_1.assert)(!this.context);
+        if (this.context) {
+            if (allowExists) {
+                return;
+            }
+            (0, assert_1.assert)(false);
+        }
         this.context = this.contextBuilder();
         this.context.begin();
         return this.context;

lib/features/contextMenuFactory.js

@@ -77,7 +77,8 @@ class ContextMenuFactory extends Feature_1.Feature {
     }
     getMenusByContext(entity, entityId) {
         (0, assert_1.assert)(this.menus, '应当先调用setMenus才能动态判定菜单');
-        this.cache.begin();
+        const needRollback = !!this.cache.begin(true);
+        try {
             const menus = this.menus
                 .filter((menu) => {
                 const { entity: destEntity, paths, action } = menu;
@@ -138,8 +139,13 @@ class ContextMenuFactory extends Feature_1.Feature {
                 return false;
             })
                 .map((wrapper) => (0, lodash_1.omit)(wrapper, ['filtersMaker']));
-        this.cache.rollback();
+            needRollback && this.cache.rollback();
             return menus;
         }
+        catch (err) {
+            needRollback && this.cache.rollback();
+            throw err;
+        }
+    }
 }
 exports.ContextMenuFactory = ContextMenuFactory;

lib/features/runningTree.d.ts

@@ -249,8 +249,7 @@ export declare class RunningTree<ED extends EntityDict & BaseEntityDict, Cxt ext
     checkIsModiNode(path: string): boolean;
     private findNode;
     destroyNode(path: string): void;
-    redoBranchOperations(path: string): void;
+    redoBranchOperations(path: string): () => void;
-    rollbackRedoBranchOperations(): void;
     getFreshValue(path: string): Partial<ED[keyof ED]["Schema"]> | Partial<ED[keyof ED]["Schema"]>[] | undefined;
     isDirty(path: string): boolean;
     addItem<T extends keyof ED>(path: string, data: Omit<ED[T]['CreateSingle']['data'], 'id'> & {

lib/features/runningTree.js

@@ -1659,7 +1659,8 @@ class RunningTree extends Feature_1.Feature {
         const paths = path.split('.');
         const root = this.root[paths[0]];
         const opers = root.composeOperations();
-        this.cache.begin();
+        const cxt = this.cache.begin();
+        if (cxt) {
             if (opers) {
                 this.cache.redoOperation(opers);
             }
@@ -1668,9 +1669,9 @@ class RunningTree extends Feature_1.Feature {
                 const modiOperations = (root instanceof SingleNode || root instanceof VirtualNode) && root.getModiOperations();
                 modiOperations && this.cache.redoOperation(modiOperations);
             }
+            return () => this.cache.rollback();
         }
-    rollbackRedoBranchOperations() {
+        return () => undefined;
-        this.cache.rollback();
     }
     getFreshValue(path) {
         const node = this.findNode(path);

lib/page.common.js

@@ -409,7 +409,7 @@ function reRender(option, extra) {
     const localeState = features.locales.getState();
     if (this.state.oakEntity && this.state.oakFullpath) {
         // 现在取数据需要把runningTree上的更新应用了再取，判定actions也一样
-        this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
+        const cleanFn = this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
         try {
             const rows = this.features.runningTree.getFreshValue(this.state.oakFullpath);
             const oakLegalActions = rows && checkActionsAndCascadeEntities.call(this, rows, option);
@@ -463,10 +463,10 @@ function reRender(option, extra) {
                 Object.assign(data, extra);
             }
             this.setState(data);
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
         }
         catch (err) {
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             throw err;
         }
     }

lib/page.mp.js

@@ -191,10 +191,16 @@ const oakBehavior = Behavior({
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
+                cleanFn();
                 return value;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
         checkOperation(entity, { action, data, filter }, checkerTypes) {
             if (checkerTypes?.includes('relation')) {
@@ -462,11 +468,17 @@ const oakBehavior = Behavior({
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
                 (0, assert_1.assert)(!(value instanceof Array));
+                cleanFn();
                 return value?.$$createAt$$ === 1;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
         async aggregate(aggregation) {
             return await this.features.cache.aggregate(this.state.oakEntity, aggregation);

lib/page.react.js

@@ -156,12 +156,18 @@ class OakComponentBase extends react_1.default.PureComponent {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
-        this.features.runningTree.redoBranchOperations(path2);
+        const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+        try {
             const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
             (0, assert_1.assert)(!(value instanceof Array));
+            cleanFn();
             return value?.$$createAt$$ === 1;
         }
+        catch (err) {
+            cleanFn();
+            throw err;
+        }
+    }
     clean(path) {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
@@ -181,11 +187,17 @@ class OakComponentBase extends react_1.default.PureComponent {
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
-        this.features.runningTree.redoBranchOperations(path2);
+        const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+        try {
             const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             return value;
         }
+        catch (err) {
+            cleanFn();
+            throw err;
+        }
+    }
     checkOperation(entity, operation, checkerTypes) {
         if (checkerTypes?.includes('relation')) {
             return this.features.relationAuth.checkRelation(entity, operation) && this.features.cache.checkOperation(entity, operation, checkerTypes);

src/features/cache.ts

@@ -655,8 +655,13 @@ export class Cache<
         return this.getFullDataFn();
     }
 
-    begin() {
+    begin(allowExists?: boolean) {
-        assert(!this.context);
+        if (this.context) {
+            if (allowExists) {
+                return;
+            }
+            assert(false);
+        }
         this.context = this.contextBuilder!();
         this.context.begin();
         return this.context;

src/features/contextMenuFactory.ts

@@ -23,7 +23,7 @@ export class ContextMenuFactory<
     Cxt extends AsyncContext<ED>,
     FrontCxt extends SyncContext<ED>,
     AD extends CommonAspectDict<ED, Cxt> & Record<string, Aspect<ED, Cxt>>
-> extends Feature {
+    > extends Feature {
     cache: Cache<ED, Cxt, FrontCxt, AD>;
     menus?: IMenu<ED, keyof ED>[];
     relationAuth: RelationAuth<ED, Cxt, FrontCxt, AD>;
@@ -122,7 +122,8 @@ export class ContextMenuFactory<
         entityId: string
     ) {
         assert(this.menus, '应当先调用setMenus才能动态判定菜单');
-        this.cache.begin();
+        const needRollback = !!this.cache.begin(true);
+        try {
             const menus = this.menus
                 .filter((menu) => {
                     const { entity: destEntity, paths, action } = menu;
@@ -207,8 +208,13 @@ export class ContextMenuFactory<
                     return false;
                 })
                 .map((wrapper) => omit(wrapper, ['filtersMaker'])) as OMenu[];
-        this.cache.rollback();
+            needRollback && this.cache.rollback();
 
             return menus;
         }
+        catch (err) {
+            needRollback && this.cache.rollback();
+            throw err;
+        }
+    }
 }

src/features/runningTree.ts

@@ -229,7 +229,7 @@ class ListNode<
                 case 'c': {
                     const { e, d } = record as CreateOpResult<ED, T>;
                     if (e === this.entity) {
-                        const context = this.cache.begin();
+                        const context = this.cache.begin()!;
                         const { filter } = this.constructSelection();
                         if (d instanceof Array) {
                             d.forEach(
@@ -276,7 +276,7 @@ class ListNode<
                             }
                         }
                         else {
-                            const context = this.cache.begin();
+                            const context = this.cache.begin()!;
                             for (const id in this.sr) {
                                 if (!f || checkFilterContains<ED, T, FrontCxt>(e, context, f, { id }, true)) {
                                     unset(this.sr, id);
@@ -2023,7 +2023,8 @@ export class RunningTree<
         const root = this.root[paths[0]];
         const opers = root.composeOperations();
 
-        this.cache.begin();
+        const cxt = this.cache.begin();
+        if (cxt) {
             if (opers) {
                 this.cache.redoOperation(opers);
             }
@@ -2033,10 +2034,10 @@ export class RunningTree<
                 const modiOperations = (root instanceof SingleNode || root instanceof VirtualNode) && root.getModiOperations();
                 modiOperations && this.cache.redoOperation(modiOperations);
             }
+            return () => this.cache.rollback();
         }
 
-    rollbackRedoBranchOperations() {
+        return () => undefined;
-        this.cache.rollback();
     }
 
     getFreshValue(path: string) {

src/page.common.ts

@@ -505,7 +505,7 @@ export function reRender<
     const localeState = features.locales.getState();
     if (this.state.oakEntity && this.state.oakFullpath) {
         // 现在取数据需要把runningTree上的更新应用了再取，判定actions也一样
-        this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
+        const cleanFn = this.features.runningTree.redoBranchOperations(this.state.oakFullpath);
         try {
             const rows = this.features.runningTree.getFreshValue(this.state.oakFullpath);
             const oakLegalActions = rows && checkActionsAndCascadeEntities.call(
@@ -570,10 +570,10 @@ export function reRender<
             }
 
             this.setState(data);
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
         }
         catch (err) {
-            this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             throw err;            
         }
     } else {

src/page.mp.ts

@@ -322,10 +322,16 @@ const oakBehavior = Behavior<
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
+                cleanFn();
                 return value;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
 
         checkOperation(entity, { action, data, filter }, checkerTypes) {
@@ -675,11 +681,17 @@ const oakBehavior = Behavior<
             const path2 = path
                 ? `${this.state.oakFullpath}.${path}`
                 : this.state.oakFullpath;
-            this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-            this.features.runningTree.rollbackRedoBranchOperations();
                 assert(!(value instanceof Array));
+                cleanFn();
                 return value?.$$createAt$$ === 1;
+            }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
         },
 
         async aggregate(aggregation) {

src/page.react.tsx

@@ -304,12 +304,18 @@ abstract class OakComponentBase<
         const path2 = path
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
-        this.features.runningTree.redoBranchOperations(path2);
+            const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+            try {
                 const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
                 assert(!(value instanceof Array));
+                cleanFn();
                 return value?.$$createAt$$ === 1;
             }
+            catch (err) {
+                cleanFn();
+                throw err;
+            }
+    }
 
     clean(path?: string) {
         const path2 = path
@@ -338,11 +344,17 @@ abstract class OakComponentBase<
             ? `${this.state.oakFullpath}.${path}`
             : this.state.oakFullpath;
 
-        this.features.runningTree.redoBranchOperations(path2);
+        const cleanFn = this.features.runningTree.redoBranchOperations(path2);
+        try {
             const value = this.features.runningTree.getFreshValue(path2);
-        this.features.runningTree.rollbackRedoBranchOperations();
+            cleanFn();
             return value;
         }
+        catch (err) {
+            cleanFn();
+            throw err;
+        }
+    }
 
     checkOperation<T2 extends keyof ED>(
         entity: T2,