oak-domain 5.0.3 → 5.0.5

package/lib/compiler/dependencyBuilder.js

@@ -199,7 +199,7 @@ function outputDependentExceptions(dependencies, briefNames, sourceFile, printer
         const { name, initializer } = vd;
         (0, assert_1.default)(ts.isIdentifier(name) && name.text === 'e');
         (0, assert_1.default)(ts.isCallExpression(initializer));
-        const callExpressions = briefNames.map(ele => factory.createCallExpression(factory.createIdentifier(`make${(0, string_1.firstLetterUpperCase)(ele)}Exception`), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)], [factory.createIdentifier("data")]));
+        const callExpressions = briefNames.map(ele => factory.createCallExpression(factory.createIdentifier(`make${(0, string_1.firstLetterUpperCase)(ele)}Exception`), [factory.createTypeReferenceNode(factory.createIdentifier("ED"), undefined)], [factory.createIdentifier("data")]));
         const rightExpression = callExpressions.length === 1 ? callExpressions[0] :
             callExpressions.length === 2 ? factory.createBinaryExpression(callExpressions[0], factory.createToken(ts.SyntaxKind.BarBarToken), callExpressions[1]) : callExpressions.slice(2).reduce((prev, next) => factory.createBinaryExpression(prev, factory.createToken(ts.SyntaxKind.BarBarToken), next), factory.createBinaryExpression(callExpressions[0], factory.createToken(ts.SyntaxKind.BarBarToken), callExpressions[1]));
         Object.assign(vd, {

package/lib/compiler/schemalBuilder.js

@@ -289,7 +289,17 @@ function tryGetStringLiteralValues(moduleName, filename, obj, node, program) {
         // 本地定义的type
         const { name, type } = declaration;
         if (ts.isUnionTypeNode(type)) {
-            values.push(...type.types.map(ele => checkStringLiteralLegal(filename, obj, name.text, ele)));
+            values.push(...(type.types.map(ele => {
+                if (ts.isLiteralTypeNode(ele)) {
+                    return checkStringLiteralLegal(filename, obj, name.text, ele);
+                }
+                else if (ts.isTypeReferenceNode(ele)) {
+                    return tryGetStringLiteralValues(moduleName, filename, obj, ele, program);
+                }
+                else {
+                    throw new Error(`暂时不能处理的type${ele.getText()}`);
+                }
+            })).flat());
         }
         else if (ts.isLiteralTypeNode(type)) {
             const action = checkStringLiteralLegal(filename, obj, name.text, type);

package/lib/store/AsyncRowStore.d.ts

@@ -50,6 +50,7 @@ export declare abstract class AsyncContext<ED extends EntityDict> implements Con
     abstract getCurrentUserId(allowUnloggedIn?: boolean): string | undefined;
     abstract setCurrentUserId(userId: string | undefined): void;
     abstract toString(): Promise<string>;
+    protected abstract getSerializedData(): Promise<object>;
     abstract initialize(data?: any, later?: boolean): Promise<void>;
     abstract allowUserUpdate(): boolean;
     abstract openRootMode(): () => void;

package/lib/store/AsyncRowStore.js

@@ -28,19 +28,16 @@ class AsyncContext {
     }
     // 使一个上下文重新开始事务执行，清除历史数据（定时器中使用）
     async restartToExecute(routine) {
-        const newContext = !this.uuid ? this : {
-            ...this,
-        }; // 这里可能有问题，继承的context对象中如果有对象属性会变成指针公用，但是估计目前是跑不到的。by Xc 20231215
-        if (newContext !== this) {
-            console.warn('restartToExecute跑出了非重用当前context的情况，请仔细调试');
-        }
+        const data = await this.getSerializedData();
+        const newContext = (new (Object.getPrototypeOf(this).constructor)(this.rowStore));
+        await newContext.begin();
+        await newContext.initialize(data, true);
         newContext.opRecords = [];
         newContext.events = {
             commit: [],
             rollback: [],
         };
         newContext.opResult = {};
-        await newContext.begin();
         try {
             await routine(newContext);
             await newContext.commit();

package/lib/store/IntrinsicCheckers.js

@@ -16,10 +16,10 @@ function checkUniqueBetweenRows(rows, uniqAttrs) {
         let s = '';
         for (const a of uniqAttrs) {
             if (row[a] === null || row[a] === undefined) {
-                s + row.id;
+                s += row.id;
             }
             else {
-                s + `-${row[a]}`;
+                s += `-${row[a]}`;
             }
         }
         if (dict[s]) {
@@ -188,7 +188,17 @@ function createActionTransformerCheckers(actionDefDict) {
                     type: 'row',
                     entity,
                     filter: conditionalFilter,
-                    errMsg: '',
+                    errMsg: '数据状态已经改变',
+                    inconsistentRows: {
+                        entity,
+                        selection: (filter) => ({
+                            data: {
+                                id: 1,
+                                [attr]: 1,
+                            },
+                            filter,
+                        }),
+                    },
                 });
                 // 这里用data类型的checker改数据了不太好，先这样
                 checkers.push({
@@ -331,7 +341,6 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                 }
                 if (f) {
                     const rr = (0, filter_1.contains)(entity, context.getSchema(), data, f);
-                    console.log(rr);
                     const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
                     if (result instanceof Promise) {
                         return result.then((v) => {

package/lib/store/checker.js

@@ -68,7 +68,8 @@ function translateCheckerInAsyncContext(checker, schema) {
                             throw e;
                         }
                         else {
-                            const rows2 = await context.select(entity, {
+                            // 可能会暴露隐私信息，暂时不能这样做。by Xc
+                            /* const rows2 = await context.select(entity, {
                                 data: getFullProjection(entity, context.getSchema()),
                                 filter: Object.assign({}, operationFilter, {
                                     $not: filter2,
@@ -76,9 +77,9 @@ function translateCheckerInAsyncContext(checker, schema) {
                             }, {
                                 dontCollect: true,
                                 blockTrigger: true,
-                            });
+                            }); */
                             const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg);
-                            e.addData(entity, rows2);
+                            // e.addData(entity, rows2);
                             throw e;
                         }
                     };

package/lib/types/Exception.d.ts

@@ -1,9 +1,14 @@
-import { EntityDict, OpRecord, SelectOpResult } from "./Entity";
+import { EntityDict, OpRecord } from "./Entity";
 export declare class OakException<ED extends EntityDict> extends Error {
-    opRecord: SelectOpResult<ED>;
+    opRecords: OpRecord<ED>[];
     constructor(message?: string);
     addData<T extends keyof ED>(entity: T, rows: Partial<ED[T]['OpSchema']>[]): void;
-    setOpRecords(opRecord: SelectOpResult<ED>): void;
+    setOpRecords(opRecords: OpRecord<ED>[]): void;
+    getSerialData(): {
+        name: string;
+        message: string;
+        opRecords: OpRecord<ED>[];
+    };
     toString(): string;
 }
 export declare class OakMakeSureByMySelfException<ED extends EntityDict> extends OakException<ED> {
@@ -158,6 +163,6 @@ export declare class OakExternalException<ED extends EntityDict> extends OakUser
 export declare function makeException<ED extends EntityDict>(data: {
     name: string;
     message?: string;
-    opRecords: SelectOpResult<ED>;
+    opRecords: OpRecord<ED>[];
     [A: string]: any;
 }): OakException<ED> | undefined;

package/lib/types/Exception.js

@@ -4,7 +4,7 @@ exports.makeException = exports.OakExternalException = exports.OakPreConditionUn
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 class OakException extends Error {
-    opRecord;
+    opRecords;
     constructor(message) {
         super(message);
         this.name = new.target.name;
@@ -17,36 +17,32 @@ class OakException extends Error {
         else {
             this.__proto__ = new.target.prototype;
         }
-        this.opRecord = {
-            a: 's',
-            d: {},
-        };
+        this.opRecords = [];
     }
     addData(entity, rows) {
-        const { d } = this.opRecord;
-        const addSingleRow = (rowRoot, row) => {
-            const { id } = row;
-            if (rowRoot[id]) {
-                Object.assign(rowRoot[id], row);
-            }
-            else {
-                rowRoot[id] = row;
+        const record = {
+            a: 's',
+            d: {
+                [entity]: {},
             }
         };
-        if (!d[entity]) {
-            d[entity] = {};
+        for (const row of rows) {
+            record.d[entity][row.id] = row;
         }
-        rows.forEach(row => addSingleRow(d[entity], row));
+        this.opRecords.push(record);
     }
-    setOpRecords(opRecord) {
-        this.opRecord = opRecord;
+    setOpRecords(opRecords) {
+        this.opRecords = opRecords;
     }
-    toString() {
-        return JSON.stringify({
+    getSerialData() {
+        return {
             name: this.constructor.name,
             message: this.message,
-            opRecord: this.opRecord,
-        });
+            opRecords: this.opRecords,
+        };
+    }
+    toString() {
+        return JSON.stringify(this.getSerialData());
     }
 }
 exports.OakException = OakException;
@@ -85,9 +81,9 @@ class OakNoRelationDefException extends OakDataException {
         this.actions = actions;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             entity: this.entity,
             action: this.actions,
         });
@@ -105,7 +101,11 @@ class OakRowUnexistedException extends OakDataException {
         this.rows = rows;
     }
     toString() {
-        return JSON.stringify({ rows: this.rows });
+        const data = super.getSerialData();
+        return JSON.stringify({
+            ...data,
+            rows: this.rows
+        });
     }
     getRows() {
         return this.rows;
@@ -140,10 +140,8 @@ class OakRowInconsistencyException extends OakUserException {
         (0, assert_1.default)(!data, '现在使用addData接口来传数据');
     }
     toString() {
-        return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
-        });
+        const data = super.getSerialData();
+        return JSON.stringify(data);
     }
 }
 exports.OakRowInconsistencyException = OakRowInconsistencyException;
@@ -169,10 +167,10 @@ class OakInputIllegalException extends OakUserException {
         this.attributes = this.attributes.map(ele => `${prefix}.${ele}`);
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             attributes: this.attributes,
         });
     }
@@ -209,10 +207,10 @@ class OakUserUnpermittedException extends OakUserException {
         this.operation = operation;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             operation: this.operation,
         });
     }
@@ -231,10 +229,10 @@ class OakUserInvisibleException extends OakUserException {
         this.operation = operation;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             operation: this.operation,
         });
     }
@@ -279,9 +277,9 @@ class OakCongruentRowExists extends OakUserException {
         return this.entity;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             data: this.data,
             entity: this.entity,
         });
@@ -310,9 +308,9 @@ class OakPreConditionUnsetException extends OakUserException {
             this.code = code;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             code: this.code,
             entity: this.entity,
         });
@@ -333,9 +331,10 @@ class OakExternalException extends OakUserException {
         this.data = data;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             code: this.code,
-            message: this.message,
             source: this.source,
             data: this.data,
         });

package/package.json

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