oak-domain 5.1.32 → 5.1.33

package/lib/store/CascadeStore.d.ts

@@ -76,7 +76,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
     };
     protected preProcessDataCreated<T extends keyof ED>(entity: T, data: ED[T]['Create']['data']): void;
     protected preProcessDataUpdated(action: string, data: Record<string, any>, async?: true): void;
-    judgeRelation(entity: keyof ED, attr: string): string | 1 | 2 | string[] | 0 | -1;
+    judgeRelation(entity: keyof ED, attr: string): string | 2 | 1 | string[] | 0 | -1;
     private tryMergeModi;
     /**
      * 和具体的update过程无关的例程放在这里，包括对later动作的处理、对oper的记录以及对record的收集等

package/lib/store/CascadeStore.js

@@ -1311,6 +1311,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                     operatorId,
                                     targetEntity: entity,
                                     bornAt,
+                                    iState: 'normal',
                                     operEntity$oper: data instanceof Array ? [{
                                             id: 'dummy',
                                             action: 'create',
@@ -1450,6 +1451,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                 targetEntity: entity,
                                 bornAt,
                                 operatorId,
+                                iState: 'normal',
                                 operEntity$oper: [{
                                         id: 'dummy',
                                         action: 'create',
@@ -1496,7 +1498,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     }
                     else {
                         // 如果没有更新到行，说明这些数据还在modi当中
-                        (0, assert_1.default)(count === 0, 'update成功的行数只能为id所在行数或者0');
+                        (0, assert_1.default)(count === 0, `update成功的行数只能为id所在行数或者0，得到: ${count}, ids: ${ids.join(',')}`);
                         return await createModi();
                     }
                 }

package/lib/store/IntrinsicCheckers.js

@@ -286,7 +286,9 @@ function cascadelyCheckUpdateFilters(entity, schema, action, data, filter, matri
         if (typeof f === 'function') {
             const cf = f({ action, data, filter }, context);
             if (cf instanceof Promise) {
-                return cf.then((cf2) => cf2 ? checkConditionalFilter(cf2) : true);
+                return cf.then(
+                // @oak-ignore
+                (cf2) => cf2 ? checkConditionalFilter(cf2) : true);
             }
             return cf ? checkConditionalFilter(cf) : true;
         }

package/lib/store/RelationAuth.js

@@ -31,6 +31,7 @@ class RelationAuth {
         if (context.isRoot()) {
             return;
         }
+        // @oak-ignore 这里只有纯前台会跑到，一定是同步的
         this.checkActions2(entity, operation, context);
     }
     // 后台检查filter是否满足relation约束
@@ -58,6 +59,7 @@ class RelationAuth {
             /**
              * 找到能创建此relation的所有父级relation，只要user和其中一个有关联即可以通过
              */
+            // @oak-ignore
             const relationAuths = context.select('relationAuth', {
                 data: {
                     id: 1,
@@ -108,7 +110,9 @@ class RelationAuth {
                     return ele > 0;
                 }));
             }
-            const result = relationAuths.map(ra => checkRelationAuth(ra));
+            const result = relationAuths.map(
+            // @oak-ignore
+            ra => checkRelationAuth(ra));
             return !!result.find(ele => ele > 0);
         };
         /**
@@ -127,6 +131,7 @@ class RelationAuth {
                 if (relevantIds.length > 0) {
                     return relevantIds;
                 }
+                // @oak-ignore
                 const relations = context.select('relation', {
                     data: {
                         id: 1,
@@ -170,6 +175,7 @@ class RelationAuth {
                 // 如果没有relationId（前端cache中），直接返回false
                 return false;
             }
+            // @oak-ignore
             const value = relationIds.map(ele => checkOnRelationId(entity2, ele, entityFilter));
             if (intersection) {
                 return !(value.includes(false));
@@ -340,6 +346,7 @@ class RelationAuth {
                  * 这种情况一般发生在entity1 -> entity2上，此时entity2应该是一个固定id查询的filter
                  * 在这里先假设如果碰到了list类型的filter，直接不使用deduce路径上的对象来推导
                  */
+                // @oak-ignore
                 const rows2 = context.select(entity, {
                     data: {
                         id: 1,
@@ -363,6 +370,7 @@ class RelationAuth {
                         // 说明没有找到行，这时候有一种可能是modi。这时候只能假设是指定id更新了，其它情况很难处理。by Xc
                         if (filter.id) {
                             // 用modi对应的entity/entityId来判定
+                            // @oak-ignore
                             const modies = context.select('modi', {
                                 data: {
                                     id: 1,
@@ -820,7 +828,9 @@ class RelationAuth {
                 (0, assert_1.default)(context instanceof AsyncRowStore_1.AsyncContext);
                 return actionAuths.then((aas) => Promise.all(dlSelections.map((ele) => Promise.all(ele.map((ele2) => this.checkActionAuthInGroup(ele2.entity, ele2.filter, aas, context))))).then((result) => checkResult(result)));
             }
-            return checkResult(dlSelections.map(ele => ele.map(ele2 => this.checkActionAuthInGroup(ele2.entity, ele2.filter, actionAuths, context))));
+            return checkResult(dlSelections.map(ele => ele.map(
+            // @oak-ignore
+            ele2 => this.checkActionAuthInGroup(ele2.entity, ele2.filter, actionAuths, context))));
         };
         if (deducedLeafSelections[0] instanceof Promise) {
             return Promise.all(deducedLeafSelections)
@@ -859,11 +869,14 @@ class RelationAuth {
             const result = [];
             if (specialEntities.length > 0) {
                 // 对于deduce出来的special对象，直接判定create应该问题不大，否则写起来太烦琐（具体情况遇到了再调试）
-                result.push(...specialEntities.map(ele => this.checkOperateSpecialEntities2(ele.entity, ele.entity === entity ? node.action : 'create', ele.filter, context)));
+                result.push(...specialEntities.map(
+                // @oak-ignore
+                ele => this.checkOperateSpecialEntities2(ele.entity, ele.entity === entity ? node.action : 'create', ele.filter, context)));
             }
             if (unspecicalEntities.length > 0) {
                 const allEntities = unspecicalEntities.map(ele => ele.entity);
                 const allActions = (0, lodash_1.uniq)(unspecicalEntities.map(ele => ele.actions).flat());
+                // @oak-ignore
                 const actionAuths2 = context.select('actionAuth', {
                     data: {
                         id: 1,
@@ -937,10 +950,14 @@ class RelationAuth {
                     return result.includes(true);
                 };
                 if (actionAuths2 instanceof Promise) {
-                    result.push(actionAuths2.then((ars2) => checkActionAuths(ars2)));
+                    result.push(actionAuths2.then(
+                    // @oak-ignore
+                    (ars2) => checkActionAuths(ars2)));
                 }
                 else {
-                    result.push(checkActionAuths(actionAuths2));
+                    result.push(
+                    // @oak-ignore
+                    checkActionAuths(actionAuths2));
                 }
             }
             if (result.find(ele => ele instanceof Promise)) {
@@ -987,6 +1004,7 @@ class RelationAuth {
                         const childLegalAuths = legalPaths.map((ele) => {
                             const { path: { value: pv }, relationId } = ele;
                             const pv2 = pv ? `${pathToParent}.${pv}` : pathToParent;
+                            // @oak-ignore
                             return context.select('actionAuth', {
                                 data: {
                                     id: 1,
@@ -1006,13 +1024,18 @@ class RelationAuth {
                             }, { dontCollect: true });
                         });
                         if (childLegalAuths[0] instanceof Promise) {
-                            return Promise.all(childLegalAuths).then((clas) => child.map((c) => checkNode(c, clas.flat())));
+                            return Promise.all(childLegalAuths).then((clas) => child.map(
+                            // @oak-ignore
+                            (c) => checkNode(c, clas.flat())));
                         }
-                        return child.map((c) => checkNode(c, childLegalAuths.flat()));
+                        return child.map(
+                        // @oak-ignore
+                        (c) => checkNode(c, childLegalAuths.flat()));
                     }
                     const childLegalAuths = legalPaths.map((ele) => {
                         const { path: { value: pv }, relationId } = ele;
                         const pv2 = pv ? `${pathToParent}.${pv}` : pathToParent;
+                        // @oak-ignore
                         return context.select('actionAuth', {
                             data: {
                                 id: 1,
@@ -1032,8 +1055,11 @@ class RelationAuth {
                         }, { dontCollect: true });
                     }).flat();
                     if (childLegalAuths[0] instanceof Promise) {
-                        return Promise.all(childLegalAuths).then((clas) => checkNode(child, clas.flat()));
+                        return Promise.all(childLegalAuths).then(
+                        // @oak-ignore
+                        (clas) => checkNode(child, clas.flat()));
                     }
+                    // @oak-ignore
                     return checkNode(child, childLegalAuths);
                 }).flat();
                 if (childResult[0] instanceof Promise) {

package/lib/store/TriggerExecutor.js

@@ -104,6 +104,17 @@ class TriggerExecutor {
                 || trigger.action instanceof Array && !trigger.action.includes('create'), `trigger【${trigger.name}】是create类型但却带有filter`);
             (0, assert_1.default)(trigger.when === 'before' || trigger.when === 'commit', `定义了filter的trigger【${trigger.name}】的when只能是before或者commit`);
         }
+        if (Array.isArray(trigger.action)) {
+            const actions = trigger.action;
+            const seen = new Set();
+            const duplicate = actions.find(item => {
+                if (seen.has(item))
+                    return true;
+                seen.add(item);
+                return false;
+            });
+            (0, assert_1.default)(!duplicate, `注册 trigger 「${trigger.name}」 时发现定义中出现了重复定义的action: 「${duplicate}」`);
+        }
         Object.assign(this.triggerNameMap, {
             [trigger.name]: trigger,
         });
@@ -293,6 +304,7 @@ class TriggerExecutor {
                         const { filter } = trigger;
                         const filterr = typeof filter === 'function' ? filter(operation, context, option) : filter;
                         (0, assert_1.default)(!(filterr instanceof Promise));
+                        // @oak-ignore
                         const filterRepelled = (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter);
                         if (filterRepelled) {
                             continue;
@@ -365,6 +377,7 @@ class TriggerExecutor {
                     await this.preCommitTrigger(entity, operation, trigger, context, option);
                     return execCommitTrigger(idx + 1);
                 };
+                // @oak-ignore
                 return execPreTrigger(0)
                     .then(() => execCommitTrigger(0));
             }

package/lib/store/checker.js

@@ -161,6 +161,7 @@ function translateCheckerInSyncContext(checker, schema) {
                 }
                 (0, assert_1.default)(!(filter2 instanceof Promise));
                 (0, assert_1.default)(operationFilter2, '定义了row类型的checker但却进行了无filter操作');
+                // @oak-ignore
                 if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter2, true)) {
                     return;
                 }

package/lib/store/diffSchema.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/store/diffSchema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/store/relation.d.ts

@@ -9,4 +9,4 @@ import { StorageSchema } from "../types/Storage";
  * @param row
  * @returns
  */
-export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecognized?: boolean): string | 1 | 2 | string[] | 0 | -1;
+export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecognized?: boolean): string | 2 | 1 | string[] | 0 | -1;

package/lib/types/Configuration.d.ts

@@ -18,7 +18,7 @@ export type RedisConfiguration = {
  *  后台配置
  */
 export type ServerConfiguration = {
-    database: {
+    database?: {
         type: 'mysql';
         host: string;
         database: string;

package/lib/types/Connector.d.ts

@@ -3,6 +3,7 @@ import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OpRecord } from "./Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { OakException } from "./Exception";
+type Promisable<T> = T | Promise<T>;
 export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>> {
     callAspect: (name: string, params: any, context?: FrontCxt) => Promise<{
         result: any;
@@ -10,11 +11,11 @@ export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt exte
         message?: string | null;
     }>;
     getRouter: () => string;
-    parseRequest: (headers: IncomingHttpHeaders, body?: any, files?: any) => {
+    parseRequest: (headers: IncomingHttpHeaders, body?: any, files?: any) => Promisable<{
         contextString?: string;
         aspectName: string;
         data?: any;
-    };
+    }>;
     serializeResult: (result: any, opRecords: OpRecord<ED>[], headers: IncomingHttpHeaders, body: any, message?: string) => Promise<{
         body: any;
         headers?: Record<string, any>;
@@ -43,4 +44,18 @@ export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt exte
         [T in keyof ED]?: ED[T]['OpSchema'][];
     }>;
     getCorsHeader: () => string[];
+    getCorsExposeHeaders?: () => string[];
+    registerCustomAspect?: () => {
+        name: string;
+        handler: (params: {
+            headers?: IncomingHttpHeaders;
+            contextString?: string;
+            params?: any;
+        }) => Promise<{
+            result: any;
+            opRecords?: OpRecord<ED>[];
+            message?: string;
+        }>;
+    }[];
 }
+export {};

package/lib/types/Demand.d.ts

@@ -54,6 +54,7 @@ export type Q_State<S> = S | {
 export type Q_FullTextValue = {
     $search: string;
     $language?: 'zh_CN' | 'en_US';
+    $ts?: string;
 };
 export type Q_FullTextKey = '$text';
 export type FulltextFilter = {

package/lib/types/Exception.d.ts

@@ -1,10 +1,27 @@
 import { StorageSchema } from ".";
 import { EntityDict, OpRecord } from "./Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
+declare const OAK_EXCEPTION_SYMBOL: unique symbol;
+/**
+ * 判断一个对象是否为 OakException 实例，作用和 `instanceof` 类似，但更安全可靠。
+ *     如OakUserException继承自OakException，使用时可传入OakUserException以进一步确认类型。
+ * @param obj 需要判断的对象
+ * @param exceptionName 可选参数，指定异常类名以进一步确认
+ *
+ * ```ts
+ * if (isOakException(e, OakUserException)) {
+ *     // 这里的 e 已被类型缩小为 OakUserException
+ * }
+ * ```
+ *
+ *  @returns 如果对象是 OakException 实例则返回 true，否则返回 false
+ */
+export declare function isOakException<T extends OakException<any>>(obj: any, errType?: new () => T): obj is T;
 export declare class OakException<ED extends EntityDict & BaseEntityDict> extends Error {
     opRecords: OpRecord<ED>[];
     _module?: string;
     params?: Record<string, any>;
+    [OAK_EXCEPTION_SYMBOL]: boolean;
     constructor(message?: string, _module?: string, params?: Record<string, any>);
     addData<T extends keyof ED>(entity: T, rows: Partial<ED[T]['Schema']>[], schema: StorageSchema<ED>): void;
     setOpRecords(opRecords: OpRecord<ED>[]): void;
@@ -81,6 +98,8 @@ export declare class OakServerProxyException<ED extends EntityDict & BaseEntityD
 }
 export declare class OakClockDriftException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
+export declare class OakInsecureRequestException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+}
 export declare class OakSignatureVerificationException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
     constructor(message?: string, _module?: string, params?: Record<string, any>);
 }
@@ -200,3 +219,4 @@ export declare function makeException<ED extends EntityDict & BaseEntityDict>(da
     opRecords: OpRecord<ED>[];
     [A: string]: any;
 }): OakException<ED> | undefined;
+export {};

package/lib/types/Exception.js

@@ -1,13 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OakApplicationHasToUpgrade = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakDataInvisibleException = exports.OakOperationUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakSignatureVerificationException = exports.OakClockDriftException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakRequestTimeoutException = exports.OakException = void 0;
+exports.OakApplicationHasToUpgrade = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakDataInvisibleException = exports.OakOperationUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakSignatureVerificationException = exports.OakInsecureRequestException = exports.OakClockDriftException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakRequestTimeoutException = exports.OakException = void 0;
+exports.isOakException = isOakException;
 exports.makeException = makeException;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
+const OAK_EXCEPTION_SYMBOL = Symbol.for('oak-domain:exception');
+/**
+ * 判断一个对象是否为 OakException 实例，作用和 `instanceof` 类似，但更安全可靠。
+ *     如OakUserException继承自OakException，使用时可传入OakUserException以进一步确认类型。
+ * @param obj 需要判断的对象
+ * @param exceptionName 可选参数，指定异常类名以进一步确认
+ *
+ * ```ts
+ * if (isOakException(e, OakUserException)) {
+ *     // 这里的 e 已被类型缩小为 OakUserException
+ * }
+ * ```
+ *
+ *  @returns 如果对象是 OakException 实例则返回 true，否则返回 false
+ */
+function isOakException(obj, errType) {
+    if (!obj) {
+        return false;
+    }
+    const isOakException = !!obj[OAK_EXCEPTION_SYMBOL];
+    if (isOakException) {
+        if (!errType) {
+            return true;
+        }
+    }
+    else {
+        return false;
+    }
+    try {
+        let proto = Object.getPrototypeOf(obj);
+        const expectedName = errType.name;
+        let depth = 0;
+        const maxDepth = 10; // 防止无限循环
+        while (proto && depth < maxDepth) {
+            const constructorName = proto.constructor?.name;
+            if (constructorName === expectedName) {
+                return true;
+            }
+            proto = Object.getPrototypeOf(proto);
+            depth++;
+        }
+        return false;
+    }
+    catch (e) {
+        console.warn(e);
+        // 如果检查过程出错，安全返回 false
+        return false;
+    }
+}
 class OakException extends Error {
     opRecords;
     _module;
     params;
+    [OAK_EXCEPTION_SYMBOL] = true;
     constructor(message, _module, params) {
         super(message);
         this._module = _module;
@@ -200,6 +251,10 @@ exports.OakServerProxyException = OakServerProxyException;
 class OakClockDriftException extends OakException {
 }
 exports.OakClockDriftException = OakClockDriftException;
+// 非安全的请求（未加密）
+class OakInsecureRequestException extends OakException {
+}
+exports.OakInsecureRequestException = OakInsecureRequestException;
 // 验签失败
 class OakSignatureVerificationException extends OakException {
     constructor(message, _module, params) {
@@ -528,6 +583,10 @@ function makeException(data) {
             e = new OakClockDriftException(message, _module, params);
             break;
         }
+        case 'OakInsecureRequestException': {
+            e = new OakInsecureRequestException(message, _module, params);
+            break;
+        }
         case 'OakServerProxyException': {
             e = new OakServerProxyException(message, _module, params);
             break;

package/lib/types/Storage.d.ts

@@ -11,6 +11,7 @@ export interface IndexConfig {
     unique?: boolean;
     type?: 'fulltext' | 'btree' | 'hash' | 'spatial';
     parser?: 'ngram';
+    tsConfig?: string | string[];
 }
 export interface Index<SH extends EntityShape> {
     name: string;