oak-domain 2.5.1 → 2.6.1

package/lib/types/Exception.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakException = void 0;
 var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 var OakException = /** @class */ (function (_super) {
     tslib_1.__extends(OakException, _super);
     function OakException(message) {
@@ -17,12 +18,36 @@ var OakException = /** @class */ (function (_super) {
         else {
             _this.__proto__ = _newTarget.prototype;
         }
+        _this.opRecord = {
+            a: 's',
+            d: {},
+        };
         return _this;
     }
+    OakException.prototype.addData = function (entity, rows) {
+        var d = this.opRecord.d;
+        var addSingleRow = function (rowRoot, row) {
+            var id = row.id;
+            if (rowRoot[id]) {
+                Object.assign(rowRoot[id], row);
+            }
+            else {
+                rowRoot[id] = row;
+            }
+        };
+        if (!d[entity]) {
+            d[entity] = {};
+        }
+        rows.forEach(function (row) { return addSingleRow(d[entity], row); });
+    };
+    OakException.prototype.setOpRecords = function (opRecord) {
+        this.opRecord = opRecord;
+    };
     OakException.prototype.toString = function () {
         return JSON.stringify({
             name: this.constructor.name,
             message: this.message,
+            opRecord: this.opRecord,
         });
     };
     return OakException;
@@ -109,17 +134,13 @@ var OakRowInconsistencyException = /** @class */ (function (_super) {
     tslib_1.__extends(OakRowInconsistencyException, _super);
     function OakRowInconsistencyException(data, message) {
         var _this = _super.call(this, message) || this;
-        _this.data = data;
+        (0, assert_1.default)(!data, '现在使用addData接口来传数据');
         return _this;
     }
-    OakRowInconsistencyException.prototype.getData = function () {
-        return this.data;
-    };
     OakRowInconsistencyException.prototype.toString = function () {
         return JSON.stringify({
             name: this.constructor.name,
             message: this.message,
-            data: this.data,
         });
     };
     return OakRowInconsistencyException;
@@ -235,46 +256,69 @@ function makeException(data) {
     var name = data.name;
     switch (name) {
         case 'OakException': {
-            return new OakException(data.message);
+            var e = new OakException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakUserException': {
-            return new OakUserException(data.message);
-        }
-        case 'OakExternalException': {
-            return new OakExternalException(data.message);
+            var e = new OakUserException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakRowInconsistencyException': {
-            return new OakRowInconsistencyException(data.data, data.message);
+            var e = new OakRowInconsistencyException(data.data, data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakInputIllegalException': {
-            return new OakInputIllegalException(data.entity, data.attributes, data.message);
+            var e = new OakInputIllegalException(data.entity, data.attributes, data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakUserUnpermittedException': {
-            return new OakUserUnpermittedException(data.message);
+            var e = new OakUserUnpermittedException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakUnloggedInException': {
-            return new OakUnloggedInException(data.message);
+            var e = new OakUnloggedInException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakCongruentRowExists': {
-            return new OakCongruentRowExists(data.entity, data.data, data.message);
+            var e = new OakCongruentRowExists(data.entity, data.data, data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakRowLockedException': {
-            return new OakRowLockedException(data.message);
+            var e = new OakRowLockedException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakRowUnexistedException': {
-            return new OakRowUnexistedException(data.rows);
+            var e = new OakRowUnexistedException(data.rows);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakDeadlock': {
-            return new OakDeadlock(data.message);
+            var e = new OakDeadlock(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakDataException': {
-            return new OakDataException(data.message);
+            var e = new OakDataException(data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakUniqueViolationException': {
-            return new OakUniqueViolationException(data.rows, data.message);
+            var e = new OakUniqueViolationException(data.rows, data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         case 'OakImportDataParseException': {
-            return new OakImportDataParseException(data.message, data.line, data.header);
+            var e = new OakImportDataParseException(data.message, data.line, data.header);
+            e.setOpRecords(data.opRecords);
+            return e;
         }
         default:
             return;

package/lib/utils/SimpleConnector.d.ts

@@ -8,7 +8,7 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
     private serverUrl;
     private makeException;
     private contextBuilder;
-    constructor(serverUrl: string, makeException: (exceptionData: any) => OakException, contextBuilder: (str: string | undefined) => (store: AsyncRowStore<ED, BackCxt>) => Promise<BackCxt>);
+    constructor(serverUrl: string, makeException: (exceptionData: any) => OakException<ED>, contextBuilder: (str: string | undefined) => (store: AsyncRowStore<ED, BackCxt>) => Promise<BackCxt>);
     callAspect(name: string, params: any, context: FrontCxt): Promise<{
         result: any;
         opRecords: OpRecord<ED>[];
@@ -23,7 +23,7 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
         body: any;
         headers?: Record<string, any> | undefined;
     };
-    serializeException(exception: OakException, headers: IncomingHttpHeaders, body: any): {
+    serializeException(exception: OakException<ED>, headers: IncomingHttpHeaders, body: any): {
         body: any;
         headers?: Record<string, any> | undefined;
     };

package/package.json

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