@ondc/automation-mock-runner 1.3.48 → 1.3.49

package/dist/lib/validators/code-validator.js

@@ -205,27 +205,52 @@ class CodeValidator {
             warnings.push(`Function should return an object with properties: ${Object.keys(expectedProperties).join(", ")}`);
             return warnings;
         }
-        // Check the structure of returned objects
-        foundReturns.forEach((returnArg) => {
-            if (returnArg.type === "ObjectExpression") {
-                const returnedProps = new Set(returnArg.properties.map((p) => p.key.name));
-                const expectedProps = Object.keys(expectedProperties);
-                // Check for missing properties
-                expectedProps.forEach((prop) => {
-                    if (!returnedProps.has(prop)) {
-                        warnings.push(`Return object is missing property '${prop}' (expected: ${expectedProperties[prop].type})`);
-                    }
-                });
-                // Check for extra properties
-                returnedProps.forEach((prop) => {
-                    if (!expectedProps.includes(prop)) {
-                        warnings.push(`Return object has unexpected property '${prop}'`);
-                    }
-                });
-            }
-            else {
-                warnings.push(`Function should return an object literal with properties: ${Object.keys(expectedProperties).join(", ")}`);
+        // Flatten conditional/logical/sequence/parenthesized wrappers so that
+        // minifier output like `return cond ? {a:1} : {a:2}` or `return x && {...}`
+        // is treated as the set of object-literal branches it actually returns.
+        const objectBranches = [];
+        const stack = [...foundReturns];
+        let nonObjectFound = false;
+        while (stack.length) {
+            const node = stack.pop();
+            switch (node.type) {
+                case "ObjectExpression":
+                    objectBranches.push(node);
+                    break;
+                case "ConditionalExpression":
+                    stack.push(node.consequent, node.alternate);
+                    break;
+                case "LogicalExpression":
+                    stack.push(node.left, node.right);
+                    break;
+                case "SequenceExpression":
+                    stack.push(node.expressions[node.expressions.length - 1]);
+                    break;
+                case "ParenthesizedExpression":
+                    stack.push(node.expression);
+                    break;
+                default:
+                    nonObjectFound = true;
             }
+        }
+        if (objectBranches.length === 0 || nonObjectFound) {
+            warnings.push(`Function should return an object literal with properties: ${Object.keys(expectedProperties).join(", ")}`);
+        }
+        objectBranches.forEach((returnArg) => {
+            const returnedProps = new Set(returnArg.properties.map((p) => p.key.name));
+            const expectedProps = Object.keys(expectedProperties);
+            // Check for missing properties
+            expectedProps.forEach((prop) => {
+                if (!returnedProps.has(prop)) {
+                    warnings.push(`Return object is missing property '${prop}' (expected: ${expectedProperties[prop].type})`);
+                }
+            });
+            // Check for extra properties
+            returnedProps.forEach((prop) => {
+                if (!expectedProps.includes(prop)) {
+                    warnings.push(`Return object has unexpected property '${prop}'`);
+                }
+            });
         });
         return warnings;
     }

package/dist/test/CodeValidator.test.js

@@ -57,6 +57,12 @@ describe("CodeValidator.validate — return structure", () => {
         expect(result.isValid).toBe(false);
         expect(result.errors.some((e) => e.includes("Function should return an object literal"))).toBe(true);
     });
+    it("accepts a minified conditional return: return i ? {...} : {...}", () => {
+        const code = `function validate(i,d){return i?{valid:!0,code:200,description:"Valid request"}:{valid:!1,code:200,description:"oh no"}}`;
+        const result = code_validator_1.CodeValidator.validate(code, validateSchema);
+        expect(result.errors).toEqual([]);
+        expect(result.isValid).toBe(true);
+    });
     it("warns when only a nested helper returns and the outer function has no return", () => {
         const code = `
 			function validate(targetPayload, sessionData) {

package/dist/test/run-validate-scratch.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/run-validate-scratch.test.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const MockRunner_1 = require("../lib/MockRunner");
+describe("scratch: user-supplied validate fn", () => {
+    afterEach(async () => {
+        const shared = MockRunner_1.MockRunner.sharedRunner;
+        if (shared?.terminate)
+            await shared.terminate();
+        MockRunner_1.MockRunner.sharedRunner = undefined;
+    });
+    it("runs the user's validate() against a payload and a null payload", async () => {
+        const validateSrc = `function validate(targetPayload, sessionData) {
+  if(!targetPayload){
+    return {valid: false, code: 200, description: "oh no"};
+  }
+  return { valid: true, code: 200, description: "Valid request" };
+}`;
+        const config = {
+            meta: { domain: "ONDC:TRV14", version: "2.0.0", flowId: "testing" },
+            transaction_data: {
+                transaction_id: "e9e0b5cb-3f15-48a1-9d86-d4d643f0909d",
+                latest_timestamp: "1970-01-01T00:00:00.000Z",
+            },
+            steps: [],
+            transaction_history: [],
+            validationLib: "",
+            helperLib: "",
+        };
+        const runner = new MockRunner_1.MockRunner(config);
+        const step = runner.getDefaultStep("search", "search_0");
+        step.mock.validate = MockRunner_1.MockRunner.encodeBase64(validateSrc);
+        runner.getConfig().steps.push(step);
+        const r1 = await runner.runValidatePayloadWithSession("search_0", { context: {} }, {});
+        console.log("WITH_PAYLOAD:", JSON.stringify(r1, null, 2));
+        const r2 = await runner.runValidatePayloadWithSession("search_0", null, {});
+        console.log("WITH_NULL:", JSON.stringify(r2, null, 2));
+        expect(r1.success).toBe(true);
+        expect(r2.success).toBe(true);
+    }, 30000);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ondc/automation-mock-runner",
-	"version": "1.3.48",
+	"version": "1.3.49",
 	"description": "A TypeScript library for ONDC automation mock runner",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",