oak-domain 5.0.10 → 5.0.11

package/lib/timers/oper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vaccumOper = void 0;
+const Entity_1 = require("../types/Entity");
 const vaccum_1 = require("./vaccum");
 const filter_1 = require("../store/filter");
 /**
@@ -11,9 +12,14 @@ const filter_1 = require("../store/filter");
  */
 async function vaccumOper(option, context) {
     const { aliveLine, excludeOpers, ...rest } = option;
-    const operFilter = {};
+    const notFilters = [
+        {
+            [Entity_1.TriggerUuidAttribute]: {
+                $exists: false,
+            }
+        },
+    ];
     if (excludeOpers) {
-        const notFilters = [];
         for (const key in excludeOpers) {
             if (excludeOpers[key].length > 0) {
                 notFilters.push({
@@ -29,27 +35,28 @@ async function vaccumOper(option, context) {
                 });
             }
         }
-        if (notFilters.length > 0) {
-            operFilter.$not = {
-                $or: notFilters,
-            };
-        }
     }
     return (0, vaccum_1.vaccumEntities)({
         entities: [{
                 entity: 'operEntity',
                 aliveLine: aliveLine + 10000,
                 filter: {
-                    oper: (0, filter_1.combineFilters)('operEntity', context.getSchema(), [operFilter, {
-                            $$createAt$$: {
-                                $lt: aliveLine,
-                            }
-                        }]),
+                    oper: {
+                        $$createAt$$: {
+                            $lt: aliveLine,
+                        },
+                        $not: (0, filter_1.combineFilters)('oper', context.getSchema(), notFilters),
+                    },
                 },
             }, {
                 entity: 'oper',
                 aliveLine,
-                filter: operFilter,
+                filter: {
+                    $$createAt$$: {
+                        $lt: aliveLine,
+                    },
+                    $not: (0, filter_1.combineFilters)('oper', context.getSchema(), notFilters),
+                },
             }],
         ...rest,
     }, context);

package/lib/utils/uuid.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decompressFrom32 = exports.compressTo32 = exports.formUuid = exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
-const uuid_1 = require("uuid");
+// import { v4 } from 'uuid';
 const random_1 = require("./random/random");
 let _nodeId;
 let _clockseq;
@@ -112,9 +112,9 @@ exports.expandUuidTo36Bytes = expandUuidTo36Bytes;
 // 直接生成uuid的接口，为了适配各种环境，写成异步
 async function generateNewIdAsync(option) {
     const option2 = option || ID_OPTION;
-    if (option2?.shuffle || process.env.NODE_ENV === 'development') {
-        return (0, uuid_1.v4)({ random: await (0, random_1.getRandomValues)(16) });
-    }
+    /* if (option2?.shuffle || process.env.NODE_ENV === 'development') {
+        return v4({ random: await getRandomValues(16) });
+    } */
     return sequentialUuid({ random: await (0, random_1.getRandomValues)(16) });
 }
 exports.generateNewIdAsync = generateNewIdAsync;
@@ -150,9 +150,9 @@ function generateNewId() {
         do {
             random[iter] = Math.ceil(Math.random() * 1000) % 128;
         } while (++iter < 16);
-        if (ID_OPTION?.shuffle || process.env.NODE_ENV === 'development') {
-            return (0, uuid_1.v4)({ random });
-        }
+        /* if (ID_OPTION?.shuffle || process.env.NODE_ENV === 'development') {
+            return v4({ random });
+        } */
         return sequentialUuid({ random });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.0.10",
+    "version": "5.0.11",
     "author": {
         "name": "XuChang"
     },