Merge branch 'master' into master

packages/@aws-cdk/aws-stepfunctions/lib/json-path.ts

@@ -82,7 +82,12 @@ interface FieldHandlers {
 }
 
 export function recurseObject(obj: object | undefined, handlers: FieldHandlers, visited: object[] = []): object | undefined {
-  if (obj === undefined) { return undefined; }
+  // If the argument received is not actually an object (string, number, boolean, undefined, ...) or null
+  // just return it as is as there's nothing to be rendered. This should only happen in the original call to
+  // recurseObject as any recursive calls to it are checking for typeof value === 'object' && value !== null
+  if (typeof obj !== 'object' || obj === null) {
+    return obj;
+  }
 
   // Avoiding infinite recursion
   if (visited.includes(obj)) { return {}; }

packages/@aws-cdk/aws-stepfunctions/test/fields.test.ts

@@ -1,5 +1,5 @@
 import '@aws-cdk/assert-internal/jest';
-import { FieldUtils, JsonPath } from '../lib';
+import { FieldUtils, JsonPath, TaskInput } from '../lib';
 
 describe('Fields', () => {
   const jsonPathValidationErrorMsg = /exactly '\$', '\$\$', start with '\$.', start with '\$\$.' or start with '\$\['/;
@@ -153,6 +153,39 @@ describe('Fields', () => {
       .toStrictEqual(['$.listField', '$.numField', '$.stringField']);
   });
 
+  test('rendering a non-object value should just return itself', () => {
+    expect(
+      FieldUtils.renderObject(TaskInput.fromText('Hello World').value),
+    ).toEqual(
+      'Hello World',
+    );
+    expect(
+      FieldUtils.renderObject('Hello World' as any),
+    ).toEqual(
+      'Hello World',
+    );
+    expect(
+      FieldUtils.renderObject(null as any),
+    ).toEqual(
+      null,
+    );
+    expect(
+      FieldUtils.renderObject(3.14 as any),
+    ).toEqual(
+      3.14,
+    );
+    expect(
+      FieldUtils.renderObject(true as any),
+    ).toEqual(
+      true,
+    );
+    expect(
+      FieldUtils.renderObject(undefined),
+    ).toEqual(
+      undefined,
+    );
+  });
+
   test('repeated object references at different tree paths should not be considered as recursions', () => {
     const repeatedObject = {
       field: JsonPath.stringAt('$.stringField'),