oak-domain 1.0.0 → 1.1.0

package/lib/store/TriggerExecutor.d.ts

@@ -1,4 +1,5 @@
 import { EntityDict, OperateOption, SelectOption, SelectRowShape } from "../types/Entity";
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { Logger } from "../types/Logger";
 import { Checker } from '../types/Auth';
 import { Context } from '../types/Context';
@@ -6,7 +7,7 @@ import { Trigger, Executor } from "../types/Trigger";
 /**
  * update可能会传入多种不同的action，此时都需要检查update trigger
  */
-export declare class TriggerExecutor<ED extends EntityDict, Cxt extends Context<ED>> extends Executor<ED, Cxt> {
+export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends Executor<ED, Cxt> {
     private counter;
     private triggerMap;
     private triggerNameMap;
@@ -20,11 +21,11 @@ export declare class TriggerExecutor<ED extends EntityDict, Cxt extends Context<
     private preCommitTrigger;
     preOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
         action: 'select';
-    }, context: Cxt, option?: OperateOption | SelectOption): Promise<void>;
+    }, context: Cxt, option: OperateOption | SelectOption): Promise<void>;
     private onCommit;
     private postCommitTrigger;
     postOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
         action: 'select';
-    }, context: Cxt, option?: OperateOption | SelectOption, result?: SelectRowShape<ED[T]['Schema'], ED[T]['Selection']['data']>[]): Promise<void>;
+    }, context: Cxt, option: OperateOption | SelectOption, result?: SelectRowShape<ED[T]['Schema'], ED[T]['Selection']['data']>[]): Promise<void>;
     checkpoint(context: Cxt, timestamp: number): Promise<number>;
 }

package/lib/store/TriggerExecutor.js

@@ -1,83 +1,8 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TriggerExecutor = void 0;
-var assert_1 = __importDefault(require("assert"));
+var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 var lodash_1 = require("../utils/lodash");
 var filter_1 = require("../store/filter");
 var Trigger_1 = require("../types/Trigger");
@@ -93,7 +18,7 @@ var Trigger_1 = require("../types/Trigger");
     'stat': 'select',
 }; */
 var TriggerExecutor = /** @class */ (function (_super) {
-    __extends(TriggerExecutor, _super);
+    tslib_1.__extends(TriggerExecutor, _super);
     function TriggerExecutor(contextBuilder, logger) {
         if (logger === void 0) { logger = console; }
         var _this = _super.call(this) || this;
@@ -107,7 +32,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
     }
     TriggerExecutor.prototype.registerChecker = function (checker) {
         var entity = checker.entity, action = checker.action, checkFn = checker.checker, type = checker.type;
-        var triggerName = "".concat(entity).concat(action, "\u6743\u9650\u68C0\u67E5-").concat(this.counter++);
+        var triggerName = "".concat(String(entity)).concat(action, "\u6743\u9650\u68C0\u67E5-").concat(this.counter++);
         var trigger = {
             checkerType: type,
             name: triggerName,
@@ -177,10 +102,10 @@ var TriggerExecutor = /** @class */ (function (_super) {
         }
     };
     TriggerExecutor.prototype.preCommitTrigger = function (entity, operation, trigger, context, option) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, filter, filter2, rowStore, count, _b, _c, _d, _e;
             var _f, _g;
-            return __generator(this, function (_h) {
+            return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
                         (0, assert_1.default)(trigger.action !== 'select');
@@ -217,11 +142,11 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         rowStore = context.rowStore;
                         return [4 /*yield*/, rowStore.count(entity, {
                                 filter: filter2
-                            }, context)];
+                            }, context, {})];
                     case 3:
                         count = _h.sent();
                         if (count > 0) {
-                            throw new Error("\u5BF9\u8C61".concat(entity, "\u7684\u884C\u300C").concat(JSON.stringify(operation), "\u300D\u4E0A\u5DF2\u7ECF\u5B58\u5728\u672A\u5B8C\u6210\u7684\u8DE8\u4E8B\u52A1\u7EA6\u675F"));
+                            throw new Error("\u5BF9\u8C61".concat(String(entity), "\u7684\u884C\u300C").concat(JSON.stringify(operation), "\u300D\u4E0A\u5DF2\u7ECF\u5B58\u5728\u672A\u5B8C\u6210\u7684\u8DE8\u4E8B\u52A1\u7EA6\u675F"));
                         }
                         return [3 /*break*/, 4];
                     case 4:
@@ -248,10 +173,10 @@ var TriggerExecutor = /** @class */ (function (_super) {
     };
     TriggerExecutor.prototype.preOperation = function (entity, operation, context, option) {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var action, triggers, preTriggers, preTriggers_1, preTriggers_1_1, trigger, number, e_1_1, commitTriggers, commitTriggers_1, commitTriggers_1_1, trigger, e_2_1;
             var e_1, _b, e_2, _c;
-            return __generator(this, function (_d) {
+            return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         action = operation.action;
@@ -261,7 +186,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
-                        preTriggers_1 = __values(preTriggers), preTriggers_1_1 = preTriggers_1.next();
+                        preTriggers_1 = tslib_1.__values(preTriggers), preTriggers_1_1 = preTriggers_1.next();
                         _d.label = 2;
                     case 2:
                         if (!!preTriggers_1_1.done) return [3 /*break*/, 5];
@@ -292,7 +217,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         _d.label = 9;
                     case 9:
                         _d.trys.push([9, 14, 15, 16]);
-                        commitTriggers_1 = __values(commitTriggers), commitTriggers_1_1 = commitTriggers_1.next();
+                        commitTriggers_1 = tslib_1.__values(commitTriggers), commitTriggers_1_1 = commitTriggers_1.next();
                         _d.label = 10;
                     case 10:
                         if (!!commitTriggers_1_1.done) return [3 /*break*/, 13];
@@ -322,9 +247,9 @@ var TriggerExecutor = /** @class */ (function (_super) {
     };
     TriggerExecutor.prototype.onCommit = function (trigger, operation, cxtStr, option) {
         var _this = this;
-        return function () { return __awaiter(_this, void 0, void 0, function () {
+        return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var context, number, rowStore, filter;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.contextBuilder(cxtStr)];
                     case 1:
@@ -356,10 +281,10 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         else if (operation.filter) {
                             Object.assign(filter, { filter: operation.filter });
                         }
-                        return [4 /*yield*/, rowStore.operate(trigger.entity, __assign({ action: 'update', data: {
+                        return [4 /*yield*/, rowStore.operate(trigger.entity, tslib_1.__assign({ id: 'aaa', action: 'update', data: {
                                     $$triggerTimestamp$$: null,
                                     $$triggerData$$: null,
-                                } }, filter /** as Filter<'update', DeduceFilter<ED[T]['Schema']>> */), context)];
+                                } }, filter /** as Filter<'update', DeduceFilter<ED[T]['Schema']>> */), context, {})];
                     case 4:
                         _a.sent();
                         _a.label = 5;
@@ -372,9 +297,9 @@ var TriggerExecutor = /** @class */ (function (_super) {
         }); };
     };
     TriggerExecutor.prototype.postCommitTrigger = function (operation, trigger, context, option) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, _c, _d, _e;
-            return __generator(this, function (_f) {
+            return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
                         _b = (_a = context).on;
@@ -391,10 +316,10 @@ var TriggerExecutor = /** @class */ (function (_super) {
     };
     TriggerExecutor.prototype.postOperation = function (entity, operation, context, option, result) {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var action, triggers, postTriggers, postTriggers_1, postTriggers_1_1, trigger, number, e_3_1, commitTriggers, commitTriggers_2, commitTriggers_2_1, trigger, e_4_1;
             var e_3, _b, e_4, _c;
-            return __generator(this, function (_d) {
+            return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         action = operation.action;
@@ -404,7 +329,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
-                        postTriggers_1 = __values(postTriggers), postTriggers_1_1 = postTriggers_1.next();
+                        postTriggers_1 = tslib_1.__values(postTriggers), postTriggers_1_1 = postTriggers_1.next();
                         _d.label = 2;
                     case 2:
                         if (!!postTriggers_1_1.done) return [3 /*break*/, 5];
@@ -438,7 +363,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         _d.label = 9;
                     case 9:
                         _d.trys.push([9, 14, 15, 16]);
-                        commitTriggers_2 = __values(commitTriggers), commitTriggers_2_1 = commitTriggers_2.next();
+                        commitTriggers_2 = tslib_1.__values(commitTriggers), commitTriggers_2_1 = commitTriggers_2.next();
                         _d.label = 10;
                     case 10:
                         if (!!commitTriggers_2_1.done) return [3 /*break*/, 13];
@@ -467,10 +392,10 @@ var TriggerExecutor = /** @class */ (function (_super) {
         });
     };
     TriggerExecutor.prototype.checkpoint = function (context, timestamp) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var result, rowStore, _a, _b, entity, rows, rows_1, rows_1_1, row, $$triggerData$$, _c, name_1, operation, cxtStr, params, trigger, e_5_1, e_6_1;
             var e_6, _d, e_5, _e;
-            return __generator(this, function (_f) {
+            return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
                         result = 0;
@@ -478,7 +403,7 @@ var TriggerExecutor = /** @class */ (function (_super) {
                         _f.label = 1;
                     case 1:
                         _f.trys.push([1, 13, 14, 15]);
-                        _a = __values(this.volatileEntities), _b = _a.next();
+                        _a = tslib_1.__values(this.volatileEntities), _b = _a.next();
                         _f.label = 2;
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 12];
@@ -493,13 +418,16 @@ var TriggerExecutor = /** @class */ (function (_super) {
                                         $gt: timestamp,
                                     }
                                 },
-                            }, context)];
+                            }, context, {
+                                dontCollect: true,
+                                forUpdate: true,
+                            })];
                     case 3:
                         rows = (_f.sent()).result;
                         _f.label = 4;
                     case 4:
                         _f.trys.push([4, 9, 10, 11]);
-                        rows_1 = (e_5 = void 0, __values(rows)), rows_1_1 = rows_1.next();
+                        rows_1 = (e_5 = void 0, tslib_1.__values(rows)), rows_1_1 = rows_1.next();
                         _f.label = 5;
                     case 5:
                         if (!!rows_1_1.done) return [3 /*break*/, 8];

package/lib/store/UniversalContext.d.ts

@@ -23,4 +23,5 @@ export declare abstract class UniversalContext<ED extends EntityDict> implements
     rollback(): Promise<void>;
     getCurrentTxnId(): string | undefined;
     abstract toString(): Promise<string>;
+    abstract getCurrentUserId(): Promise<string | undefined>;
 }

package/lib/store/UniversalContext.js

@@ -1,57 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UniversalContext = void 0;
-var assert_1 = __importDefault(require("assert"));
+var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 var concurrent_1 = require("../utils/concurrent");
 var UniversalContext = /** @class */ (function () {
     function UniversalContext(store) {
@@ -83,9 +34,9 @@ var UniversalContext = /** @class */ (function () {
      * @param options
      */
     UniversalContext.prototype.begin = function (options) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.rwLock.acquire('X')];
                     case 1:
@@ -105,10 +56,10 @@ var UniversalContext = /** @class */ (function () {
         });
     };
     UniversalContext.prototype.commit = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, e, e_1_1;
             var e_1, _c;
-            return __generator(this, function (_d) {
+            return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         if (!this.uuid) return [3 /*break*/, 10];
@@ -121,7 +72,7 @@ var UniversalContext = /** @class */ (function () {
                         _d.label = 2;
                     case 2:
                         _d.trys.push([2, 7, 8, 9]);
-                        _a = __values(this.events.commit), _b = _a.next();
+                        _a = tslib_1.__values(this.events.commit), _b = _a.next();
                         _d.label = 3;
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 6];
@@ -153,10 +104,10 @@ var UniversalContext = /** @class */ (function () {
         });
     };
     UniversalContext.prototype.rollback = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, e, e_2_1;
             var e_2, _c;
-            return __generator(this, function (_d) {
+            return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         if (!this.uuid) return [3 /*break*/, 10];
@@ -169,7 +120,7 @@ var UniversalContext = /** @class */ (function () {
                         _d.label = 2;
                     case 2:
                         _d.trys.push([2, 7, 8, 9]);
-                        _a = __values(this.events.rollback), _b = _a.next();
+                        _a = tslib_1.__values(this.events.rollback), _b = _a.next();
                         _d.label = 3;
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 6];

package/lib/store/action.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 判断一个action是不是延时性操作，如果是则返回动作本身
+ * @param action
+ * @returns
+ */
+export declare function isLaterAction(action: string): string | undefined;

package/lib/store/action.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLaterAction = void 0;
+/**
+ * 判断一个action是不是延时性操作，如果是则返回动作本身
+ * @param action
+ * @returns
+ */
+function isLaterAction(action) {
+    if (action.endsWith('-l')) {
+        return action.slice(0, action.length - 2);
+    }
+}
+exports.isLaterAction = isLaterAction;

package/lib/store/actionDef.js

@@ -1,42 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzeActionDefDict = exports.checkFilterContains = exports.getFullProjection = void 0;
+var tslib_1 = require("tslib");
 var filter_1 = require("./filter");
 var types_1 = require("../types");
 function getFullProjection(entity, schema) {
@@ -57,10 +22,10 @@ function getFullProjection(entity, schema) {
 }
 exports.getFullProjection = getFullProjection;
 function checkFilterContains(entity, schema, contained, context, filter) {
-    return __awaiter(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var rowStore, filter2, result, data_1;
         var _a;
-        return __generator(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     if (!filter) {
@@ -79,7 +44,9 @@ function checkFilterContains(entity, schema, contained, context, filter) {
                             filter: filter2,
                             indexFrom: 0,
                             count: 10,
-                        }, context)];
+                        }, context, {
+                            dontCollect: true,
+                        })];
                 case 1:
                     result = (_b.sent()).result;
                     if (result.length > 0) {
@@ -115,8 +82,8 @@ function makeIntrinsicWatchers(schema) {
             watchers.push({
                 entity: entity,
                 name: "\u5BF9\u8C61".concat(entity, "\u4E0A\u7684\u8FC7\u671F\u81EA\u52A8watcher"),
-                filter: function () { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
+                filter: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    return tslib_1.__generator(this, function (_a) {
                         return [2 /*return*/, {
                                 expired: false,
                                 expiresAt: {
@@ -153,10 +120,10 @@ function analyzeActionDefDict(schema, actionDefDict) {
                     entity: entity,
                     checker: function (_a, context) {
                         var operation = _a.operation;
-                        return __awaiter(_this, void 0, void 0, function () {
+                        return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var filter, conditionalFilter;
                             var _b, _c;
-                            return __generator(this, function (_d) {
+                            return tslib_1.__generator(this, function (_d) {
                                 switch (_d.label) {
                                     case 0:
                                         filter = operation.filter;
@@ -183,10 +150,10 @@ function analyzeActionDefDict(schema, actionDefDict) {
                     when: 'before',
                     fn: function (_a) {
                         var operation = _a.operation;
-                        return __awaiter(_this, void 0, void 0, function () {
+                        return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var _b, data;
                             var _c;
-                            return __generator(this, function (_d) {
+                            return tslib_1.__generator(this, function (_d) {
                                 _b = operation.data, data = _b === void 0 ? {} : _b;
                                 Object.assign(operation, {
                                     data: Object.assign(data, (_c = {},
@@ -210,10 +177,10 @@ function analyzeActionDefDict(schema, actionDefDict) {
                     when: 'before',
                     fn: function (_a) {
                         var operation = _a.operation;
-                        return __awaiter(_this, void 0, void 0, function () {
+                        return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var data;
                             var _b;
-                            return __generator(this, function (_c) {
+                            return tslib_1.__generator(this, function (_c) {
                                 data = operation.data;
                                 Object.assign(data, (_b = {},
                                     _b[attr] = is,

package/lib/store/filter.d.ts

@@ -34,3 +34,9 @@ export declare function contains<ED extends EntityDict, T extends keyof ED>(enti
  * @param conditionalFilter
  */
 export declare function repel<ED extends EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>, filter1: ED[T]['Selection']['filter'], filter2: ED[T]['Selection']['filter']): boolean;
+/**
+ * 从filter中判断是否有确定的id对象，如果有则返回这些id，没有返回空数组
+ * @param filter
+ * @returns
+ */
+export declare function getRelevantIds<ED extends EntityDict, T extends keyof ED>(filter: ED[T]['Selection']['filter']): string[];