oak-domain 5.0.10 → 5.0.12

package/lib/store/IntrinsicCheckers.js

@@ -79,7 +79,7 @@ function createUniqueCheckers(schema) {
                         entity,
                         action: 'create',
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: (operation, context) => {
                             const { data } = operation;
                             if (data instanceof Array) {
@@ -95,9 +95,9 @@ function createUniqueCheckers(schema) {
                         }
                     }, {
                         entity,
-                        action: 'update', // 只检查update，其它状态转换的action应该不会涉及unique约束的属性
+                        action: 'update',
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: (operation, context) => {
                             const { data, filter: operationFilter } = operation;
                             if (data) {
@@ -227,7 +227,7 @@ function createActionTransformerCheckers(actionDefDict) {
                     action: 'create',
                     type: 'logical',
                     entity,
-                    priority: 10, // 优先级要高，先于真正的data检查进行
+                    priority: 10,
                     checker: (operation) => {
                         const { data } = operation;
                         if (data instanceof Array) {

package/lib/store/checker.js

@@ -352,11 +352,11 @@ function checkAttributeLegal(schema, entity, data) {
                 case 'char':
                 case 'varchar': {
                     if (typeof data[attr] !== 'string') {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a string');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not a string`);
                     }
                     const { length } = params;
                     if (length && data[attr].length > length) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too long');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too long`);
                     }
                     break;
                 }
@@ -367,21 +367,21 @@ function checkAttributeLegal(schema, entity, data) {
                 case 'decimal':
                 case 'money': {
                     if (typeof data[attr] !== 'number') {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a number');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not a number`);
                     }
                     const { min, max } = params || {};
                     if (typeof min === 'number' && data[attr] < min) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too small');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too small`);
                     }
                     if (typeof max === 'number' && data[attr] > max) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too big');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too big`);
                     }
                     break;
                 }
                 case 'enum': {
                     (0, assert_1.default)(enumeration);
                     if (!enumeration.includes(data[attr])) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not in enumeration');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not in enumeration`);
                     }
                     break;
                 }

package/lib/store/filter.js

@@ -22,7 +22,14 @@ function translateCreateDataToFilter(schema, entity, data, allowUnrecoganized) {
                 'array',
                 'object'
             ].includes(schema[entity].attributes[attr]?.type)) {
-                data2[attr] = data[attr];
+                if (data[attr] === null) {
+                    data2[attr] = {
+                        $exists: false,
+                    };
+                }
+                else {
+                    data2[attr] = data[attr];
+                }
             }
         }
     }

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * 防止assert打包体积过大，从这里引用
  */

package/lib/utils/relationPath.js

@@ -60,7 +60,7 @@ function destructRelationPath(schema, entity, path, relationFilter, recursive) {
                         },
                         filter: relationFilter,
                     } // as ED['userRelation']['Selection']
-                }, // as ED[keyof ED]['Selection']['data'],
+                },
                 getData: (d) => {
                     return d.userRelation$entity;
                 },

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.12",
     "author": {
         "name": "XuChang"
     },

package/src/entities/ModiEntity.ts

@@ -1,26 +1,26 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { Schema as Modi } from './Modi';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '更新对象连接',
-            attr: {
-                modi: '更新',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { Schema as Modi } from './Modi';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '更新对象连接',
+            attr: {
+                modi: '更新',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/OperEntity.ts

@@ -1,27 +1,27 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '操作对象连接',
-            attr: {
-                oper: '操作',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/Relation.ts

@@ -1,43 +1,43 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    entity: String<32>;
-    entityId?: String<64>;        // 可以为空
-    name?: String<32>;
-    display?: String<32>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                name: '关系',
-                entity: '目标对象',
-                entityId: '目标对象id',
-                display: '显示值',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_targetEntity_entityId_name',
-            attributes: [
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'name',
-                }
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId?: String<64>;        // 可以为空
+    name?: String<32>;
+    display?: String<32>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                name: '关系',
+                entity: '目标对象',
+                entityId: '目标对象id',
+                display: '显示值',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_targetEntity_entityId_name',
+            attributes: [
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'name',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};

package/src/entities/UserEntityClaim.ts

@@ -1,30 +1,30 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-import { Schema as UserEntityGrant } from './UserEntityGrant';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { Schema as UserRelation } from './UserRelation';
-
-export interface Schema extends EntityShape {
-    ueg: UserEntityGrant;
-    user: User;
-    relation: Relation;
-    claimEntityId: String<64>;
-    userRelation: UserRelation;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权领取',
-            attr: {
-                ueg: '授权',
-                user: '用户',
-                relation: '关系',
-                claimEntityId: '对象Id',
-                userRelation: '用户关系',
-            },
-        },
-    },
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+import { Schema as UserEntityGrant } from './UserEntityGrant';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { Schema as UserRelation } from './UserRelation';
+
+export interface Schema extends EntityShape {
+    ueg: UserEntityGrant;
+    user: User;
+    relation: Relation;
+    claimEntityId: String<64>;
+    userRelation: UserRelation;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权领取',
+            attr: {
+                ueg: '授权',
+                user: '用户',
+                relation: '关系',
+                claimEntityId: '对象Id',
+                userRelation: '用户关系',
+            },
+        },
+    },
 };

package/src/entities/UserEntityGrant.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-type RelationIds = string[];
-
-export interface Schema extends EntityShape {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                relationIds: '关系',
-                relationEntity: '关联对象',
-                relationEntityFilter: '对象限定条件',
-            },
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+type RelationIds = string[];
+
+export interface Schema extends EntityShape {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relationIds: '关系',
+                relationEntity: '关联对象',
+                relationEntityFilter: '对象限定条件',
+            },
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -1,50 +1,50 @@
-import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
-import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    user: User;
-    relation: Relation;
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户对象关系',
-            attr: {
-                user: '关系',
-                relation: '目标关系',
-                entity: '目标对象',
-                entityId: '目标对象ID',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_user_entity_entityId_relation',
-            attributes: [
-                {
-                    name: 'user',
-                },
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'relation',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户对象关系',
+            attr: {
+                user: '关系',
+                relation: '目标关系',
+                entity: '目标对象',
+                entityId: '目标对象ID',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_user_entity_entityId_relation',
+            attributes: [
+                {
+                    name: 'user',
+                },
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};