oak-domain 5.0.9 → 5.0.11

package/lib/store/CascadeStore.js

@@ -162,6 +162,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         checkSortAttr(attr, sortAttr[attr], projNode[attr]);
                     }
                 }
+                assignNecessaryProjectionAttrs(projNode, necessaryAttrs);
             };
             sorterNode.forEach((node) => {
                 const { $attr } = node;

package/lib/store/TriggerExecutor.js

@@ -304,9 +304,17 @@ class TriggerExecutor {
                             return execPreTrigger(idx + 1);
                         }
                     }
-                    const number = await trigger.fn({ operation: operation }, context, option);
-                    if (number > 0 && process.env.NODE_ENV === 'development') {
-                        this.logger.info(`前触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                    const closeRoot = trigger.asRoot && context.openRootMode();
+                    try {
+                        const number = await trigger.fn({ operation: operation }, context, option);
+                        if (number > 0 && process.env.NODE_ENV === 'development') {
+                            this.logger.info(`前触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                        }
+                        closeRoot && closeRoot();
+                    }
+                    catch (err) {
+                        closeRoot && closeRoot();
+                        throw err;
                     }
                     return execPreTrigger(idx + 1);
                 };
@@ -338,26 +346,41 @@ class TriggerExecutor {
         (0, assert_1.default)(trigger && trigger.when === 'commit');
         (0, assert_1.default)(ids.length > 0);
         const { fn } = trigger;
-        const callback = await fn({ ids }, context, option);
-        if (trigger.strict === 'makeSure') {
-            // 这里开root模式，否则还可能有权限问题
-            context.openRootMode();
-            await context.operate(entity, {
-                id: await (0, uuid_1.generateNewIdAsync)(),
-                action: 'update',
-                data: {
-                    [Entity_1.TriggerDataAttribute]: null,
-                    [Entity_1.TriggerUuidAttribute]: null,
-                },
-                filter: {
-                    id: {
-                        $in: ids,
-                    }
+        const closeRoot = trigger.asRoot && context.openRootMode();
+        try {
+            const callback = await fn({ ids }, context, option);
+            if (trigger.strict === 'makeSure') {
+                // 这里开root模式，否则还可能有权限问题
+                const closeRoot2 = context.openRootMode();
+                try {
+                    await context.operate(entity, {
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        action: 'update',
+                        data: {
+                            [Entity_1.TriggerDataAttribute]: null,
+                            [Entity_1.TriggerUuidAttribute]: null,
+                        },
+                        filter: {
+                            id: {
+                                $in: ids,
+                            }
+                        }
+                    }, { includedDeleted: true, blockTrigger: true });
+                    closeRoot2 && closeRoot2();
+                }
+                catch (err2) {
+                    closeRoot2 && closeRoot2();
+                    throw err2;
                 }
-            }, { includedDeleted: true, blockTrigger: true });
+            }
+            if (typeof callback === 'function') {
+                await callback(context, option);
+            }
+            closeRoot && closeRoot();
         }
-        if (typeof callback === 'function') {
-            await callback(context, option);
+        catch (err) {
+            closeRoot && closeRoot();
+            throw err;
         }
     }
     /**
@@ -407,12 +430,20 @@ class TriggerExecutor {
                         return;
                     }
                     const trigger = postTriggers[idx];
-                    const number = await trigger.fn({
-                        operation: operation,
-                        result: result,
-                    }, context, option);
-                    if (number > 0 && process.env.NODE_ENV === 'development') {
-                        this.logger.info(`后触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                    const closeRoot = trigger.asRoot && context.openRootMode();
+                    try {
+                        const number = await trigger.fn({
+                            operation: operation,
+                            result: result,
+                        }, context, option);
+                        if (number > 0 && process.env.NODE_ENV === 'development') {
+                            this.logger.info(`后触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                        }
+                        closeRoot && closeRoot();
+                    }
+                    catch (err) {
+                        closeRoot && closeRoot();
+                        throw err;
                     }
                     return execPostTrigger(idx + 1);
                 };

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/types/Trigger.d.ts

@@ -21,6 +21,7 @@ interface TriggerBase<ED extends EntityDict, T extends keyof ED> {
     checkerType?: CheckerType;
     entity: T;
     name: string;
+    asRoot?: true;
     priority?: number;
 }
 export interface CreateTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {

package/lib/utils/projection.d.ts

@@ -2,3 +2,4 @@ import { EntityDict } from '../types/Entity';
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { StorageSchema } from '../types/Storage';
 export declare function makeProjection<ED extends BaseEntityDict & EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>): ED[T]["Selection"]["data"];
+export declare function traverseProjection<ED extends BaseEntityDict & EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>, projection: ED[T]['Selection']['data'], callback: <T2 extends keyof ED>(entity2: T2, projection2: ED[T2]['Selection']['data']) => void): void;

package/lib/utils/projection.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeProjection = void 0;
+exports.traverseProjection = exports.makeProjection = void 0;
 const Entity_1 = require("../types/Entity");
+const relation_1 = require("../store/relation");
 function makeProjection(entity, schema) {
     const { attributes } = schema[entity];
     const attrs = Object.keys(attributes);
@@ -13,3 +14,22 @@ function makeProjection(entity, schema) {
     return projection;
 }
 exports.makeProjection = makeProjection;
+function traverseProjection(entity, schema, projection, callback) {
+    const access = (entity2, proj) => {
+        callback(entity2, proj);
+        for (const attr in proj) {
+            const rel = (0, relation_1.judgeRelation)(schema, entity2, attr);
+            if (rel === 2) {
+                access(attr, proj[attr]);
+            }
+            else if (typeof rel === 'string') {
+                access(rel, proj[attr]);
+            }
+            else if (rel instanceof Array) {
+                access(rel[0], proj[attr].data);
+            }
+        }
+    };
+    access(entity, projection);
+}
+exports.traverseProjection = traverseProjection;

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.9",
+    "version": "5.0.11",
     "author": {
         "name": "XuChang"
     },