fix(util-endpoints): call multi-level functions from callFunction (#3929

)
aws · Sep 12, 2022 · 1209cb1 · 1209cb1
1 parent 1cee1f4
commit 1209cb1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/packages/util-endpoints/src/utils/callFunction.spec.ts b/packages/util-endpoints/src/utils/callFunction.spec.ts
@@ -11,9 +11,11 @@ describe(callFunction.name, () => {
   };
   const mockFunctionName = "mockFunctionName";
   const mockReturn = "mockReturn";
+  const mockArgReturn = "mockArgReturn";
 
   beforeEach(() => {
     lib[mockFunctionName] = jest.fn().mockReturnValue(mockReturn);
+    (evaluateExpression as jest.Mock).mockReturnValue(mockArgReturn);
   });
 
   afterEach(() => {
@@ -32,15 +34,26 @@ describe(callFunction.name, () => {
   it.each(["string", { ref: "ref" }, { fn: "fn", argv: [] }])(
     "calls evaluateExpression for non-boolean arg: %s",
     (arg) => {
-      const mockArgReturn = "mockArgReturn";
       const mockFn = { fn: mockFunctionName, argv: [arg] };
 
-      (evaluateExpression as jest.Mock).mockReturnValue(mockArgReturn);
-
       const result = callFunction(mockFn, mockOptions);
       expect(result).toBe(mockReturn);
       expect(evaluateExpression).toHaveBeenCalledWith(arg, "arg", mockOptions);
       expect(lib[mockFunctionName]).toHaveBeenCalledWith(mockArgReturn);
     }
   );
+
+  it("calls multi-level function", () => {
+    const mockSecondLevelFunctionName = "mockSecondLevelFunctionName";
+    lib[mockFunctionName][mockSecondLevelFunctionName] = jest.fn().mockReturnValue(mockReturn);
+
+    const mockArg = "mockArg";
+    const mockFn = { fn: `${mockFunctionName}.${mockSecondLevelFunctionName}`, argv: [mockArg] };
+
+    const result = callFunction(mockFn, mockOptions);
+    expect(result).toBe(mockReturn);
+    expect(evaluateExpression).toHaveBeenCalledWith(mockArg, "arg", mockOptions);
+    expect(lib[mockFunctionName]).not.toHaveBeenCalled();
+    expect(lib[mockFunctionName][mockSecondLevelFunctionName]).toHaveBeenCalledWith(mockArgReturn);
+  });
 });
diff --git a/packages/util-endpoints/src/utils/callFunction.ts b/packages/util-endpoints/src/utils/callFunction.ts
@@ -3,7 +3,7 @@ import { EvaluateOptions, FunctionObject, FunctionReturn } from "../types";
 import { evaluateExpression } from "./evaluateExpression";
 
 export const callFunction = ({ fn, argv }: FunctionObject, options: EvaluateOptions): FunctionReturn => {
-  const argvArray = argv.map((arg) => (typeof arg === "boolean" ? arg : evaluateExpression(arg, "arg", options)));
+  const evaluatedArgs = argv.map((arg) => (typeof arg === "boolean" ? arg : evaluateExpression(arg, "arg", options)));
   // @ts-ignore Element implicitly has an 'any' type
-  return lib[fn](...argvArray);
+  return fn.split(".").reduce((acc, key) => acc[key], lib)(...evaluatedArgs);
 };