oak-domain 5.0.19 → 5.0.20

package/lib/compiler/routerBuilder.js

@@ -124,7 +124,7 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
             let path2 = path;
             if (params2[path]) {
                 // 如果有参数，接在path后面
-                path2 += `/:${params2[path]}`;
+                path2 += path2 ? `/:${params2[path]}` : `:${params2[path]}`;
             }
             const properties = [
                 factory.createPropertyAssignment('path', factory.createStringLiteral(path2)),

package/lib/store/CascadeStore.js

@@ -1229,7 +1229,12 @@ class CascadeStore extends RowStore_1.RowStore {
                     // 变成对modi的插入
                     // 优化，这里如果是对同一个targetEntity反复update，则变成对最后一条create/update的modi进行update，以避免发布文章这样的需求时产生过多的modi
                     let modiUpsert;
-                    if (action !== 'remove') {
+                    if (action === 'update') {
+                        // 如果action本身是update，且没有实际update属性，这里可以忽略
+                        const updateAttrCount = Object.keys(data).length;
+                        if (updateAttrCount === 0) {
+                            return {};
+                        }
                         const upsertModis = await this.selectAbjointRowAsync('modi', {
                             data: {
                                 id: 1,

package/lib/store/IntrinsicCheckers.js

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

package/lib/types/Exception.d.ts

@@ -19,6 +19,8 @@ export declare class OakException<ED extends EntityDict & BaseEntityDict> extend
     tag2?: boolean;
     tag3?: any;
 }
+export declare class OakMakeSureByMySelfException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+}
 export declare class OakPartialSuccess<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
 export declare class OakDataException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakException = void 0;
+exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -90,6 +90,10 @@ class OakException extends Error {
     tag3;
 }
 exports.OakException = OakException;
+// 这个异常表示模块自己处理跨事务一致性，框架pass（在分布式数据传递时会用到）（backend-base老版本有使用先保留）
+class OakMakeSureByMySelfException extends OakException {
+}
+exports.OakMakeSureByMySelfException = OakMakeSureByMySelfException;
 // 这个异常表示事务虽然没有完全成功，但是仍然应该提交并抛出异常（在分布式数据传递时会用到）
 class OakPartialSuccess extends OakException {
 }

package/lib/utils/assert.d.ts

@@ -1,3 +1,4 @@
+/// <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/validator.js

@@ -13,8 +13,10 @@ const isPassword = (text) => {
     return ((text) && (typeof text === "string") && (/^[a-zA-Z0-9!.@]{8,16}$/.test(text)));
 };
 exports.isPassword = isPassword;
-const isCaptcha = (text) => {
-    return ((text) && (typeof text === "string") && (/^\d{4}$/.test(text)));
+const isCaptcha = (text, num) => {
+    const n = num || 4;
+    const regex = new RegExp(`^\\d{${n}}$`);
+    return ((text) && (typeof text === "string") && (regex.test(text)));
 };
 exports.isCaptcha = isCaptcha;
 const isIdCardNumber = (text) => {

package/package.json

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