do inline function body parsing in config

aws · Dec 16, 2024 · 65060f2 · 65060f2
1 parent 9e81af4
commit 65060f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/aws-cdk/lib/config.ts b/packages/aws-cdk/lib/config.ts
@@ -422,9 +422,11 @@ export class DynamicValue {
   }
 
   public static fromInline(f: () => any): DynamicResult {
+    const ARROW = '=>';
+    const body = f.toString();
     return {
       dynamicType: 'function',
-      dynamicValue: f.toString(),
+      dynamicValue: body.substring(body.indexOf(ARROW) + ARROW.length).trim(),
     };
   }
 }
diff --git a/tools/@aws-cdk/yargs-gen/lib/yargs-gen.ts b/tools/@aws-cdk/yargs-gen/lib/yargs-gen.ts
@@ -126,9 +126,7 @@ function makeOptions(prefix: Expression, options: { [optionName: string]: CliOpt
         optionArgs[optionProp] = code.expr.ident(optionValue.dynamicValue);
       } else if (optionValue && optionValue.dynamicType === 'function') {
         const inlineFunction: string = optionValue.dynamicValue;
-        const NUMBER_OF_SPACES_BETWEEN_ARROW_AND_CODE = 3;
-        // this only works with arrow functions, like () =>
-        optionArgs[optionProp] = code.expr.directCode(inlineFunction.substring(inlineFunction.indexOf('=>') + NUMBER_OF_SPACES_BETWEEN_ARROW_AND_CODE));
+        optionArgs[optionProp] = code.expr.directCode(inlineFunction);
       } else {
         optionArgs[optionProp] = lit(optionValue);
       }