oak-domain 5.1.23 → 5.1.25

package/lib/store/CascadeStore.d.ts

@@ -33,7 +33,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
     protected abstract updateAbjointRowAsync<T extends keyof ED, OP extends OperateOption, Cxt extends AsyncContext<ED>>(entity: T, operation: ED[T]['Create'] | ED[T]['Update'] | ED[T]['Remove'], context: Cxt, option: OP): Promise<number>;
     protected abstract aggregateAbjointRowSync<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
     protected abstract aggregateAbjointRowAsync<T extends keyof ED, OP extends SelectOption, Cxt extends AsyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
-    protected destructCascadeSelect<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED> | AsyncContext<ED>>(entity: T, projection2: ED[T]['Projection'], context: Cxt, cascadeSelectFn: <T2 extends keyof ED>(entity2: T2, selection: ED[T2]['Selection'], context: Cxt, op: OP) => Partial<ED[T2]['Schema']>[] | Promise<Partial<ED[T2]['Schema']>[]>, aggregateFn: <T2 extends keyof ED>(entity2: T2, aggregation: ED[T2]['Aggregation'], context: Cxt, op: OP) => AggregationResult<ED[T2]['Schema']> | Promise<AggregationResult<ED[T2]['Schema']>>, option: OP): {
+    protected destructCascadeSelect<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED> | AsyncContext<ED>>(entity: T, projection2: ED[T]['Projection'], context: Cxt, cascadeSelectFn: <T2 extends keyof ED>(entity2: T2, selection: ED[T2]['Selection'], context: Cxt, op: OP) => Partial<ED[T2]['Schema']>[] | Promise<Partial<ED[T2]['Schema']>[]>, aggregateFn: <T2 extends keyof ED>(entity2: T2, aggregation: ED[T2]['Aggregation'], context: Cxt, op: OP) => AggregationResult<ED[T2]['Schema']> | Promise<AggregationResult<ED[T2]['Schema']>>, option: OP, selectionId?: string): {
         projection: ED[T]["Projection"];
         cascadeSelectionFns: ((result: Partial<ED[T]['Schema']>[]) => Promise<void> | void)[];
     };

package/lib/store/CascadeStore.js

@@ -317,7 +317,7 @@ class CascadeStore extends RowStore_1.RowStore {
     registerSelectionRewriter(rewriter) {
         this.selectionRewriters.push(rewriter);
     }
-    destructCascadeSelect(entity, projection2, context, cascadeSelectFn, aggregateFn, option) {
+    destructCascadeSelect(entity, projection2, context, cascadeSelectFn, aggregateFn, option, selectionId) {
         const cascadeSelectionFns = [];
         const supportMtoJoin = this.supportManyToOneJoin();
         const { toModi } = this.getSchema()[entity];
@@ -352,7 +352,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             });
                         }
                     });
-                    const { projection: subProjection, cascadeSelectionFns: subCascadeSelectionFns, } = this.destructCascadeSelect(attr, projection2[attr], context, cascadeSelectFn, aggregateFn, option);
+                    const { projection: subProjection, cascadeSelectionFns: subCascadeSelectionFns, } = this.destructCascadeSelect(attr, projection2[attr], context, cascadeSelectFn, aggregateFn, option, selectionId);
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
@@ -372,6 +372,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                     throw new types_1.OakRowUnexistedException([{
                                             entity: attr,
                                             selection: {
+                                                id: selectionId,
                                                 data: projection2[attr],
                                                 filter: {
                                                     id: {
@@ -400,6 +401,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         };
                         if (entityIds.length > 0) {
                             const subRows = cascadeSelectFn.call(this, attr, {
+                                id: selectionId,
                                 data: projection2[attr],
                                 filter: {
                                     id: {
@@ -440,7 +442,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             }
                         });
                     }
-                    const { projection: subProjection, cascadeSelectionFns: subCascadeSelectionFns, } = this.destructCascadeSelect(relation, projection2[attr], context, cascadeSelectFn, aggregateFn, option);
+                    const { projection: subProjection, cascadeSelectionFns: subCascadeSelectionFns, } = this.destructCascadeSelect(relation, projection2[attr], context, cascadeSelectFn, aggregateFn, option, selectionId);
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
@@ -489,6 +491,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         };
                         if (ids.length > 0) {
                             const subRows = cascadeSelectFn.call(this, relation, {
+                                id: selectionId,
                                 data: projection2[attr],
                                 filter: {
                                     id: {
@@ -506,7 +509,7 @@ class CascadeStore extends RowStore_1.RowStore {
             }
             else {
                 (0, assert_1.default)(relation instanceof Array);
-                const { data: subProjection, filter: subFilter, indexFrom, count, sorter: subSorter, total, randomRange } = projection2[attr];
+                const { data: subProjection, filter: subFilter, indexFrom, count, sorter: subSorter, total, randomRange, id: subSelectionId } = projection2[attr];
                 const [entity2, foreignKey] = relation;
                 const isAggr = attr.endsWith('$$aggr');
                 const otmAggrFn = (result) => {
@@ -573,6 +576,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                 },
                             }, subFilter]);
                         const subRows = cascadeSelectFn.call(this, entity2, {
+                            id: subSelectionId || selectionId,
                             data: subProjection,
                             filter: filter2,
                             sorter: subSorter,
@@ -600,6 +604,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                     entityId: row.id,
                                 }, subFilter]);
                             const subRows = cascadeSelectFn.call(this, entity2, {
+                                id: subSelectionId || selectionId,
                                 data: subProjection,
                                 filter: filter2,
                                 sorter: subSorter,
@@ -1662,7 +1667,7 @@ class CascadeStore extends RowStore_1.RowStore {
      * @param rows
      * @param context
      */
-    addToResultSelections(entity, rows, context) {
+    addToResultSelections(entity, rows, context, id) {
         if (this.supportManyToOneJoin()) {
             // 这里的外键连接有可能为空，需要使用所有的行的attr的并集来测试
             const attrs = (0, lodash_1.uniq)(rows.map(ele => Object.keys(ele)).flat());
@@ -1671,29 +1676,29 @@ class CascadeStore extends RowStore_1.RowStore {
                 const data = {};
                 const rel = this.judgeRelation(entity, attr);
                 if (rel === 2) {
-                    this.addToResultSelections(attr, rows.map(ele => ele[attr]).filter(ele => !!ele), context);
+                    this.addToResultSelections(attr, rows.map(ele => ele[attr]).filter(ele => !!ele), context, id);
                 }
                 else if (typeof rel === 'string') {
-                    this.addToResultSelections(rel, rows.map(ele => ele[attr]).filter(ele => !!ele), context);
+                    this.addToResultSelections(rel, rows.map(ele => ele[attr]).filter(ele => !!ele), context, id);
                 }
                 else if (rel instanceof Array) {
-                    this.addToResultSelections(rel[0], rows.map(ele => ele[attr]).reduce((prev, current) => prev.concat(current), []), context);
+                    this.addToResultSelections(rel[0], rows.map(ele => ele[attr]).reduce((prev, current) => prev.concat(current), []), context, id);
                 }
                 else {
                     attrsToPick.push(attr);
                 }
             }
             const originRows = rows.map(ele => (0, lodash_1.pick)(ele, attrsToPick));
-            this.addSingleRowToResultSelections(entity, originRows, context);
+            this.addSingleRowToResultSelections(entity, originRows, context, id);
         }
         else {
-            this.addSingleRowToResultSelections(entity, rows, context);
+            this.addSingleRowToResultSelections(entity, rows, context, id);
         }
     }
-    addSingleRowToResultSelections(entity, rows, context) {
+    addSingleRowToResultSelections(entity, rows, context, id) {
         const { opRecords } = context;
         let lastOperation = opRecords[opRecords.length - 1];
-        if (lastOperation && lastOperation.a === 's') {
+        if (lastOperation && lastOperation.a === 's' && id === lastOperation.id) {
             const entityBranch = lastOperation.d[entity];
             if (entityBranch) {
                 rows.forEach((row) => {
@@ -1714,6 +1719,7 @@ class CascadeStore extends RowStore_1.RowStore {
         }
         else {
             lastOperation = {
+                id,
                 a: 's',
                 d: {},
             };
@@ -1733,8 +1739,8 @@ class CascadeStore extends RowStore_1.RowStore {
         });
     }
     async cascadeSelectAsync(entity, selection, context, option) {
-        const { data, filter, indexFrom, count, sorter, total, randomRange, distinct } = selection;
-        const { projection, cascadeSelectionFns } = this.destructCascadeSelect(entity, data, context, this.cascadeSelectAsync, this.aggregateAsync, option);
+        const { data, filter, indexFrom, count, sorter, total, randomRange, distinct, id: selectionId } = selection;
+        const { projection, cascadeSelectionFns } = this.destructCascadeSelect(entity, data, context, this.cascadeSelectAsync, this.aggregateAsync, option, selectionId);
         const rows2 = await this.selectAbjointRowAsync(entity, {
             data: projection,
             filter,
@@ -1758,7 +1764,7 @@ class CascadeStore extends RowStore_1.RowStore {
             });
         }
         if (!option.dontCollect) {
-            this.addToResultSelections(entity, rows, context);
+            this.addToResultSelections(entity, rows, context, selection.id);
         }
         if (cascadeSelectionFns.length > 0) {
             const ruException = [];

package/lib/store/IntrinsicCheckers.js

@@ -262,9 +262,19 @@ function createActionTransformerCheckers(actionDefDict) {
  * @param filters
  * @param context
  */
-function cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, restAttrs, context) {
+function cascadelyCheckUpdateFilters(entity, schema, action, data, filter, matrix, restAttrs, context) {
     const successAttrs = (0, lodash_1.difference)(Object.keys(data), restAttrs);
     const successAttrFilter = (0, lodash_1.pick)(data, successAttrs);
+    const checkConditionalFilter = (cf) => {
+        // 此时看应用了success的attributes更新后，能否消除掉f中的部分条件
+        const result = (0, filter_1.analyzeFilterRelation)(entity, schema, successAttrFilter, cf, true);
+        if (typeof result === 'boolean') {
+            return result;
+        }
+        const { sureAttributes } = result;
+        const f2 = (0, lodash_1.omit)(cf, sureAttributes);
+        return (0, filter_1.checkFilterContains)(entity, context, f2, filter, true);
+    };
     /**
      * 先找到能直接更新成功的属性
      */
@@ -273,15 +283,14 @@ function cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, restA
         if (!f) {
             return true;
         }
-        (0, assert_1.default)(typeof f !== 'function', '此处是原来写的时候的疏漏情况，跑出来再改。by Xc 20250214');
-        // 此时看应用了success的attributes更新后，能否消除掉f中的部分条件
-        const result = (0, filter_1.analyzeFilterRelation)(entity, schema, successAttrFilter, f, true);
-        if (typeof result === 'boolean') {
-            return result;
+        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 ? checkConditionalFilter(cf) : true;
         }
-        const { sureAttributes } = result;
-        const f2 = (0, lodash_1.omit)(f, sureAttributes);
-        return (0, filter_1.checkFilterContains)(entity, context, f2, filter, true);
+        return checkConditionalFilter(f);
     });
     const checkResult1 = (lar) => {
         const legalAttrs = [];
@@ -301,7 +310,7 @@ function cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, restA
         if (legalAttrs.length === 0) {
             throw new types_1.OakAttrCantUpdateException(entity, illegalAttrs, '更新的行当前属性不满足约束，请仔细检查数据');
         }
-        return cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, illegalAttrs, context);
+        return cascadelyCheckUpdateFilters(entity, schema, action, data, filter, matrix, illegalAttrs, context);
     };
     if (legalAttrResult.find(ele => ele instanceof Promise)) {
         return Promise.all(legalAttrResult).then((lar) => checkResult1(lar));
@@ -341,30 +350,33 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                 }
                 const filters = condition.map(ele => {
                     if (typeof ele?.filter === 'function') {
-                        return ele.filter(action || 'select');
+                        return (ele.filter)({ action: action || 'select', data: data, filter }, context);
                     }
                     return ele?.filter;
-                }).filter(ele => !!ele);
-                const f = filters.length > 0 && (0, filter_1.combineFilters)(entity, schema, filters);
-                if (f) {
-                    const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
-                    if (result instanceof Promise) {
-                        return result.then((v) => {
-                            if (!v) {
-                                if (attrs.length > 1) {
-                                    return cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, attrs, context);
-                                }
-                                throw new types_1.OakAttrCantUpdateException(entity, attrs);
+                });
+                const checkFiltersInner = (filters2) => {
+                    const filters3 = filters2.filter(ele => !!ele);
+                    const f = filters3.length > 0 && (0, filter_1.combineFilters)(entity, schema, filters3);
+                    const checkResultInner = (result2) => {
+                        if (!result2) {
+                            if (attrs.length > 1) {
+                                return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
                             }
-                        });
-                    }
-                    if (!result) {
-                        if (attrs.length > 1) {
-                            return cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, attrs, context);
+                            throw new types_1.OakAttrCantUpdateException(entity, attrs);
                         }
-                        throw new types_1.OakAttrCantUpdateException(entity, attrs, '更新的行当前属性不满足约束，请仔细检查数据');
+                    };
+                    if (f) {
+                        const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
+                        if (result instanceof Promise) {
+                            return result.then((r) => checkResultInner(r));
+                        }
+                        return checkResultInner(result);
                     }
+                };
+                if (filters.find(ele => ele instanceof Promise)) {
+                    return Promise.all(filters).then((ff) => checkFiltersInner(ff));
                 }
+                return checkFiltersInner(filters);
             }
         };
         checkers.push(updateChecker);

package/lib/types/Configuration.d.ts

@@ -45,6 +45,12 @@ export type ServerConfiguration = {
         headers?: string[];
         methods?: string[];
     };
+    ui?: {
+        path?: string;
+        disable?: boolean;
+        username?: string;
+        password?: string;
+    };
     internalExceptionMask?: string;
     koaBody?: IKoaBodyOptions;
     socket?: (ctx: Koa.ParameterizedContext<any, KoaRouter.IRouterParamContext<any, {}>, any>) => {

package/lib/types/Entity.d.ts

@@ -182,6 +182,7 @@ export type CascadeRelationAuth<R extends string> = {
     [K in R]?: CascadeRelationItem | (CascadeRelationItem | CascadeRelationItem[])[];
 };
 export type SelectOpResult<ED extends EntityDict> = {
+    id?: string;
     a: 's';
     d: {
         [T in keyof ED]?: {

package/lib/types/EntityDesc.d.ts

@@ -1,7 +1,11 @@
 import { LocaleDef } from './Locale';
 import { Index } from './Storage';
 import { EntityShape, Configuration, EntityDict } from './Entity';
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { StyleDesc } from './Style';
+import { AsyncContext } from '../store/AsyncRowStore';
+import { SyncContext } from '../store/SyncRowStore';
+import { SyncOrAsync } from './Polyfill';
 export type EntityDesc<Schema extends EntityShape, Action extends string = '', Relation extends string = '', V extends Record<string, string> = {
     ['##oak_illegal##']: '';
 }> = {
@@ -14,11 +18,15 @@ export type EntityDesc<Schema extends EntityShape, Action extends string = '', R
 }) : {
     style: StyleDesc<Action, V>;
 });
-export type AttrUpdateMatrix<ED extends EntityDict> = {
+export type AttrUpdateMatrix<ED extends EntityDict & BaseEntityDict> = {
     [T in keyof ED]?: {
         [A in keyof ED[T]['Update']['data']]?: {
             actions?: ED[T]['Action'][];
-            filter?: (NonNullable<ED[T]['Filter']>) | ((action: ED[T]['Action']) => ED[T]['Filter'] | undefined);
+            filter?: (NonNullable<ED[T]['Filter']>) | ((option: {
+                action: ED[T]['Action'];
+                data: ED[T]['Update']['data'];
+                filter?: ED[T]['Update']['filter'];
+            }, context: AsyncContext<ED> | SyncContext<ED>) => SyncOrAsync<ED[T]['Filter'] | undefined>);
         };
     };
 };

package/lib/utils/SimpleConnector.js

@@ -189,7 +189,7 @@ class SimpleConnector {
         };
     }
     async serializeResult(result, opRecords, headers, body, message) {
-        if (result instanceof stream_1.Stream || result instanceof Buffer || result instanceof ReadableStream) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer) {
             return {
                 body: result,
                 headers: {

package/package.json

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