quidproquo-actionprocessor-node 0.0.206 → 0.0.208

package/lib/commonjs/actionProcessor/core/system/SystemActionProcessor.js

@@ -10,16 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
-const processBatch = ({ actions }, session, actionProcessors, logger, updateSession) => __awaiter(void 0, void 0, void 0, function* () {
-    const batchRes = yield Promise.all(actions.map((a) => (0, quidproquo_core_1.processAction)(a, actionProcessors, session, logger, updateSession)));
-    // If there was an error, throw that error back
-    const erroredBatchItem = batchRes.find((br) => (0, quidproquo_core_1.isErroredActionResult)(br));
+const processBatch = (payload, session, actionProcessors, logger, updateSession) => __awaiter(void 0, void 0, void 0, function* () {
+    // console.log('~~~~~~~~~~~ RUNNING BATCH ~~~~~~~~~: ', payload);
+    const batchRes = yield Promise.all(payload.actions.map((a) => (0, quidproquo_core_1.processAction)(a, actionProcessors, session, logger, updateSession)));
+    // console.log('~~~~~~~~~~~ RESULT BATCH ~~~~~~~~~: ', batchRes);
+    // If there was an error, that does not want to be returned, throw that error back
+    const erroredBatchItem = batchRes.find((br, i) => (0, quidproquo_core_1.isErroredActionResult)(br) && !payload.actions[i].returnErrors);
     if (erroredBatchItem) {
         const error = (0, quidproquo_core_1.resolveActionResultError)(erroredBatchItem);
         return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.GenericError, error.errorText, error.errorStack);
     }
     // unwrap the values
-    return (0, quidproquo_core_1.actionResult)(batchRes.map((br) => (0, quidproquo_core_1.resolveActionResult)(br)));
+    return (0, quidproquo_core_1.actionResult)(batchRes.map((br, i) => {
+        // If we want to return errors, return the either result.
+        if (payload.actions[i].returnErrors) {
+            const isSuccess = !(0, quidproquo_core_1.isErroredActionResult)(br);
+            const result = isSuccess
+                ? {
+                    success: true,
+                    result: (0, quidproquo_core_1.resolveActionResult)(br),
+                }
+                : {
+                    success: false,
+                    error: (0, quidproquo_core_1.resolveActionResultError)(br),
+                };
+            return result;
+        }
+        // return the resolved result
+        return (0, quidproquo_core_1.resolveActionResult)(br);
+    }));
 });
 exports.default = {
     [quidproquo_core_1.SystemActionType.Batch]: processBatch,

package/lib/esm/actionProcessor/core/system/SystemActionProcessor.js

@@ -1,14 +1,33 @@
 import { ErrorTypeEnum, SystemActionType, actionResult, actionResultError, isErroredActionResult, processAction, resolveActionResult, resolveActionResultError, } from 'quidproquo-core';
-const processBatch = async ({ actions }, session, actionProcessors, logger, updateSession) => {
-    const batchRes = await Promise.all(actions.map((a) => processAction(a, actionProcessors, session, logger, updateSession)));
-    // If there was an error, throw that error back
-    const erroredBatchItem = batchRes.find((br) => isErroredActionResult(br));
+const processBatch = async (payload, session, actionProcessors, logger, updateSession) => {
+    // console.log('~~~~~~~~~~~ RUNNING BATCH ~~~~~~~~~: ', payload);
+    const batchRes = await Promise.all(payload.actions.map((a) => processAction(a, actionProcessors, session, logger, updateSession)));
+    // console.log('~~~~~~~~~~~ RESULT BATCH ~~~~~~~~~: ', batchRes);
+    // If there was an error, that does not want to be returned, throw that error back
+    const erroredBatchItem = batchRes.find((br, i) => isErroredActionResult(br) && !payload.actions[i].returnErrors);
     if (erroredBatchItem) {
         const error = resolveActionResultError(erroredBatchItem);
         return actionResultError(ErrorTypeEnum.GenericError, error.errorText, error.errorStack);
     }
     // unwrap the values
-    return actionResult(batchRes.map((br) => resolveActionResult(br)));
+    return actionResult(batchRes.map((br, i) => {
+        // If we want to return errors, return the either result.
+        if (payload.actions[i].returnErrors) {
+            const isSuccess = !isErroredActionResult(br);
+            const result = isSuccess
+                ? {
+                    success: true,
+                    result: resolveActionResult(br),
+                }
+                : {
+                    success: false,
+                    error: resolveActionResultError(br),
+                };
+            return result;
+        }
+        // return the resolved result
+        return resolveActionResult(br);
+    }));
 };
 export default {
     [SystemActionType.Batch]: processBatch,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "quidproquo-actionprocessor-node",
-  "version": "0.0.206",
+  "version": "0.0.208",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
-  "types": "./lib/esm/index.d.ts",
+  "types": "./lib/commonjs/index.d.ts",
   "sideEffects": false,
   "files": [
     "lib/**/*"
@@ -13,7 +13,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "npx rimraf lib && npx rimraf node_modules",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "watch": "tsc -p tsconfig.esm.json -w",
+    "watch": "tsc -p tsconfig.commonjs.json -w",
     "build:cjs": "tsc -p tsconfig.commonjs.json",
     "build:esm": "tsc -p tsconfig.esm.json"
   },
@@ -32,13 +32,13 @@
     "@anthropic-ai/sdk": "^0.19.1",
     "axios": "^1.2.1",
     "mime-types": "^2.1.35",
-    "quidproquo-core": "0.0.206",
+    "quidproquo-core": "0.0.208",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.1",
     "@types/uuid": "^9.0.0",
-    "quidproquo-tsconfig": "0.0.206",
+    "quidproquo-tsconfig": "0.0.208",
     "typescript": "^4.9.3"
   }
 }