oak-domain 5.0.2 → 5.0.4

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/TriggerExecutor.js

@@ -43,7 +43,7 @@ class TriggerExecutor {
             if (!context.getCurrentTxnId()) {
                 await context.begin();
             }
-            await context.initialize(JSON.parse(cxtStr));
+            await context.initialize(JSON.parse(cxtStr), true);
             try {
                 await this.execVolatileTrigger(entity, trigger.name, ids, context, option);
                 await context.commit();

package/lib/utils/lodash.d.ts

@@ -29,5 +29,5 @@ import pullAll from 'lodash/pullAll';
  * @returns
  */
 declare function mergeConcatArray(object: any, source: any): any;
-declare function mergeConcatMany<T>(array: Array<T>): T;
+declare function mergeConcatMany<T>(array: Array<T>): T | undefined;
 export { unset, pull, uniq, uniqBy, get, set, intersection, intersectionBy, omit, merge, mergeWith, mergeConcatArray, mergeConcatMany, cloneDeep, pick, isEqual, union, difference, differenceBy, groupBy, unionBy, pullAll, };

package/lib/utils/lodash.js

@@ -67,6 +67,9 @@ function mergeConcatArray(object, source) {
 }
 exports.mergeConcatArray = mergeConcatArray;
 function mergeConcatMany(array) {
+    if (array.length === 0) {
+        return undefined;
+    }
     return array.reduce((prev, current) => mergeConcatArray(prev, current));
 }
 exports.mergeConcatMany = mergeConcatMany;

package/package.json

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