oak-domain 5.1.22 → 5.1.24

package/lib/compiler/schemalBuilder.d.ts

@@ -1,3 +1,22 @@
+import * as ts from 'typescript';
+declare const Schema: Record<string, {
+    schemaAttrs: Array<ts.PropertySignature>;
+    fulltextIndex?: true;
+    indexes?: ts.ArrayLiteralExpression;
+    sourceFile: ts.SourceFile;
+    enumAttributes: Record<string, string[]>;
+    locale: ts.ObjectLiteralExpression;
+    toModi: boolean;
+    toLog: boolean;
+    actionType: string;
+    static: boolean;
+    inModi: boolean;
+    relations: false | string[];
+    extendsFrom: string[];
+    importAttrFrom: Record<string, [string, string | undefined]>;
+}>;
+export declare function constructAttributes(entity: string): ts.PropertyAssignment[];
+export declare function translateLocaleObject(locale: ts.ObjectLiteralExpression): Record<string, any>;
 /**
  * 此函数不再使用
  * @param map
@@ -23,6 +42,9 @@ export declare function registerFixedDestinationPathMap(map: Record<string, stri
  * @param map
  */
 export declare function registerDeducedRelationMap(map: Record<string, string>): void;
+export declare const getAnalizedSchema: () => typeof Schema;
 export declare function analyzeEntities(inputDir: string, relativePath?: string): void;
 export declare function buildSchemaBackup(outputDir: string): void;
+export declare function getProjectionKeys(entity: string): string[];
 export declare function buildSchema(outputDir: string): void;
+export {};

package/lib/compiler/schemalBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSchema = exports.buildSchemaBackup = exports.analyzeEntities = exports.registerDeducedRelationMap = exports.registerFixedDestinationPathMap = exports.registerIgnoredRelationPathMap = exports.registerFreeEntities = exports.registerIgnoredForeignKeyMap = void 0;
+exports.buildSchema = exports.getProjectionKeys = exports.buildSchemaBackup = exports.analyzeEntities = exports.getAnalizedSchema = exports.registerDeducedRelationMap = exports.registerFixedDestinationPathMap = exports.registerIgnoredRelationPathMap = exports.registerFreeEntities = exports.registerIgnoredForeignKeyMap = exports.translateLocaleObject = exports.constructAttributes = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const assert_1 = tslib_1.__importDefault(require("assert"));
@@ -2256,6 +2256,64 @@ function _constructOpProjection(statements, entity) {
         exprNode,
     ])));
 }
+function getOpProjectionKeys(entity) {
+    const { schemaAttrs, enumAttributes } = Schema[entity];
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const result = [
+        'id',
+        '$$createAt$$',
+        '$$updateAt$$',
+        '$$seq$$',
+    ];
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
+        if (ts.isTypeReferenceNode(type)) {
+            const { typeName } = type;
+            if (ts.isIdentifier(typeName)) {
+                const typeStr = typeName.text;
+                switch (typeStr) {
+                    case 'String':
+                    case 'Text':
+                    case 'Int':
+                    case 'Uint':
+                    case 'Float':
+                    case 'Double':
+                    case 'Boolean':
+                    case 'Datetime':
+                    case 'Image':
+                    case 'File':
+                    case 'SingleGeo':
+                    case 'Geo':
+                    case 'Price':
+                    case 'Decimal':
+                        result.push(attrName);
+                        break;
+                    case 'Object':
+                        result.push(attrName);
+                        break;
+                    default: {
+                        const refEntity = typeStr === 'Schema' ? entity : typeStr;
+                        const isManyToOne = manyToOneSet?.some(([e]) => e === refEntity);
+                        if (isManyToOne) {
+                            result.push(`${attrName}Id`);
+                        }
+                        else if (!enumAttributes?.[attrName]) {
+                            result.push(attrName);
+                        }
+                        else {
+                            result.push(attrName);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            result.push(attrName);
+        }
+    }
+    return result;
+}
 /**
  * 构造Query
  * @param statements
@@ -3951,6 +4009,26 @@ function constructAttributes(entity) {
     });
     return result;
 }
+exports.constructAttributes = constructAttributes;
+function translateLocaleObject(locale) {
+    const result = {};
+    locale.properties.forEach((ele) => {
+        (0, assert_1.default)(ts.isPropertyAssignment(ele) && (ts.isIdentifier(ele.name) || ts.isStringLiteral(ele.name)), `locale对象中的属性定义不正确`);
+        const name = ele.name.text;
+        if (ts.isStringLiteral(ele.initializer)) {
+            result[name] = ele.initializer.text;
+        }
+        else if (ts.isObjectLiteralExpression(ele.initializer)) {
+            const subObj = translateLocaleObject(ele.initializer);
+            result[name] = subObj;
+        }
+        else {
+            throw new Error(`locale对象中的属性${name}的定义不正确`);
+        }
+    });
+    return result;
+}
+exports.translateLocaleObject = translateLocaleObject;
 function outputLocale(outputDir, printer) {
     const locales = {};
     const entities = [];
@@ -4768,6 +4846,10 @@ function outputStyleDict(outputDir, printer) {
     const filename = path_1.default.join(outputDir, 'StyleDict.ts');
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
 }
+const getAnalizedSchema = () => {
+    return Schema;
+};
+exports.getAnalizedSchema = getAnalizedSchema;
 function analyzeEntities(inputDir, relativePath) {
     const files = (0, fs_1.readdirSync)(inputDir);
     const fullFilenames = files.map(ele => {
@@ -5474,6 +5556,76 @@ function _outputEntityDict(outputDir, printer) {
     const fileName = path_1.default.join(outputDir, 'EntityDict.ts');
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
+function getProjectionKeys(entity) {
+    const keys = [];
+    const { schemaAttrs } = Schema[entity];
+    const { [entity]: manyToOneSet = [] } = ManyToOne;
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
+        if (ts.isTypeReferenceNode(type)) {
+            const typeName = type.typeName;
+            if (ts.isIdentifier(typeName)) {
+                const text = typeName.text;
+                switch (text) {
+                    case 'String':
+                    case 'Text':
+                    case 'Int':
+                    case 'Uint':
+                    case 'Float':
+                    case 'Double':
+                    case 'Boolean':
+                    case 'Datetime':
+                    case 'Image':
+                    case 'File':
+                    case 'SingleGeo':
+                    case 'Geo':
+                    case 'Price':
+                    case 'Decimal':
+                    case 'Object':
+                        break;
+                    default:
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet.find(([refEntity]) => refEntity === text2);
+                        if (manyToOneItem) {
+                            keys.push(attrName); // 外键属性
+                        }
+                }
+            }
+        }
+    }
+    if (ReversePointerRelations[entity]) {
+        for (const one of ReversePointerRelations[entity]) {
+            const text2 = one === 'Schema' ? entity : one;
+            keys.push((0, string_1.firstLetterLowerCase)(one));
+        }
+    }
+    const { [entity]: oneToManySet = [] } = OneToMany;
+    const foreignKeySet = {};
+    for (const [entityName, foreignKey] of oneToManySet) {
+        if (!foreignKeySet[entityName]) {
+            foreignKeySet[entityName] = [];
+        }
+        foreignKeySet[entityName].push(foreignKey);
+    }
+    for (const entityName in foreignKeySet) {
+        const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+        for (const foreignKey of foreignKeySet[entityName]) {
+            const identifier = `${entityNameLc}$${foreignKey}`;
+            keys.push(identifier);
+            const aggrKey = _getAggrKey(entityNameLc, foreignKey);
+            if (typeof aggrKey === 'string') {
+                keys.push(aggrKey);
+            }
+            else {
+                // 如果是 union 类型，用映射表达式模拟（如 ["xxx$$aggr", `xxx$$${number}$$aggr`]）
+                keys.push(`${identifier}$$aggr`);
+            }
+        }
+    }
+    return [...new Set([...keys, ...getOpProjectionKeys(entity)])];
+}
+exports.getProjectionKeys = getProjectionKeys;
 function _outputSchema(outputDir, printer) {
     for (const entity in Schema) {
         const statements = [

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));
@@ -352,7 +361,7 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                         return result.then((v) => {
                             if (!v) {
                                 if (attrs.length > 1) {
-                                    return cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, attrs, context);
+                                    return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
                                 }
                                 throw new types_1.OakAttrCantUpdateException(entity, attrs);
                             }
@@ -360,7 +369,7 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                     }
                     if (!result) {
                         if (attrs.length > 1) {
-                            return cascadelyCheckUpdateFilters(entity, schema, data, filter, matrix, attrs, context);
+                            return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
                         }
                         throw new types_1.OakAttrCantUpdateException(entity, attrs, '更新的行当前属性不满足约束，请仔细检查数据');
                     }

package/lib/store/RelationAuth.js

@@ -1045,6 +1045,11 @@ class RelationAuth {
             if (actionAuths && actionAuths.length > 0) {
                 return checkChildren(actionAuths);
             }
+            // 如果这个entity是updateFree，直接过掉到子结点判定
+            const { action, entity } = node;
+            if (this.updateFreeDict[entity] && this.updateFreeDict[entity].includes(action)) {
+                return checkChildren([]);
+            }
             // 没有能根据父亲传下来的actionAuth判定，只能自己找
             const result = this.findActionAuthsOnNode(node, context);
             const checkResult = (result2) => {
@@ -1083,9 +1088,6 @@ class RelationAuth {
     }
     checkOperation(entity, operation, context) {
         const { action, filter, data } = operation;
-        if (this.updateFreeDict[entity] && this.updateFreeDict[entity].includes(action)) {
-            return true;
-        }
         const userId = context.getCurrentUserId();
         if (!userId) {
             throw new types_1.OakUnloggedInException();

package/lib/types/Configuration.d.ts

@@ -45,6 +45,11 @@ export type ServerConfiguration = {
         headers?: string[];
         methods?: string[];
     };
+    ui?: {
+        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/types/Exception.d.ts

@@ -12,6 +12,7 @@ export declare class OakException<ED extends EntityDict & BaseEntityDict> extend
         name: string;
         message: string;
         _module: string | undefined;
+        params: Record<string, any> | undefined;
         opRecords: OpRecord<ED>[];
         tag1: string | undefined;
         tag2: boolean | undefined;

package/lib/types/Exception.js

@@ -80,6 +80,7 @@ class OakException extends Error {
             name: this.constructor.name,
             message: this.message,
             _module: this._module,
+            params: this.params,
             opRecords: this.opRecords,
             tag1: this.tag1,
             tag2: this.tag2,

package/lib/utils/SimpleConnector.d.ts

@@ -36,7 +36,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         opRecords: any;
         message: string | null;
     } | {
-        result: ArrayBuffer;
+        result: ReadableStream<Uint8Array> | null;
         message: string | null;
         opRecords?: undefined;
     }>;
@@ -45,7 +45,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         opRecords: any;
         message: string | null;
     } | {
-        result: ArrayBuffer;
+        result: ReadableStream<Uint8Array> | null;
         message: string | null;
         opRecords?: undefined;
     }>;

package/lib/utils/SimpleConnector.js

@@ -81,8 +81,7 @@ class SimpleConnector {
             throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
-        const responseType = response.headers.get('Content-Type') ||
-            response.headers.get('content-type');
+        const responseType = response.headers.get('Content-Type') || response.headers.get('content-type');
         if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
             const { exception, result, opRecords } = await response.json();
             if (exception) {
@@ -94,18 +93,24 @@ class SimpleConnector {
                 message,
             };
         }
-        else if (responseType
-            ?.toLocaleLowerCase()
-            .match(/application\/octet-stream/i)) {
-            const result = await response.arrayBuffer();
+        //  else if (
+        //     responseType
+        //         ?.toLocaleLowerCase()
+        //         .match(/application\/octet-stream/i)
+        // ) {
+        //     const result = await response.arrayBuffer();
+        //     return {
+        //         result,
+        //         message,
+        //     };
+        // } 
+        else {
+            const result = response.body;
             return {
                 result,
                 message,
             };
         }
-        else {
-            throw new Error(`尚不支持的content-type类型${responseType}`);
-        }
     }
     async callAspect(name, params, context) {
         const { headers, body } = await this.makeHeadersAndBody(name, params, context);
@@ -153,8 +158,7 @@ class SimpleConnector {
             throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
-        const responseType = response.headers.get('Content-Type') ||
-            response.headers.get('content-type');
+        const responseType = response.headers.get('Content-Type') || response.headers.get('content-type');
         if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
             const { socketUrl, subscribeUrl, path } = await response.json();
             return {
@@ -185,7 +189,7 @@ class SimpleConnector {
         };
     }
     async serializeResult(result, opRecords, headers, body, message) {
-        if (result instanceof stream_1.Stream || result instanceof Buffer) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer || result instanceof ReadableStream) {
             return {
                 body: result,
                 headers: {

package/package.json

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