Fixing the state name and cleanup on readme

packages/aws-cdk-lib/aws-stepfunctions/README.md

@@ -124,7 +124,7 @@ becomes new the new Data object. This behavior can be modified by supplying valu
 
 These properties impact how each individual step interacts with the state machine data:
 
-* `stateName`: the custom state name to each state if required else we used the construct id
+* `stateName`: the name of the state in the state machine definition. If not supplied, defaults to the construct id.
 * `inputPath`: the part of the data object that gets passed to the step (`itemsPath` for `Map` states)
 * `resultSelector`: the part of the step result that should be added to the state machine data
 * `resultPath`: where in the state machine data the step result should be inserted
@@ -250,8 +250,6 @@ An arbitrary JSON object (specified at execution start) is passed from state to
 state and transformed during the execution of the workflow. For more
 information, see the States Language spec.
 
-You can add custom state names to all states and if not it defaults to construct id.
-
 ### Task
 
 A `Task` represents some work that needs to be done. Do not use the `Task` class directly.
@@ -284,12 +282,11 @@ The `Pass` state also supports passing key-value pairs as input. Values can
 be static, or selected from the input with a path.
 
 The following example filters the `greeting` field from the state input
-and also injects a field called `otherData`. You can also add custom state name
-to Pass state.
+and also injects a field called `otherData`.
 
 ```ts
 const pass = new sfn.Pass(this, 'Filter input and inject data', {
-  stateName: 'my-pass-state',
+  stateName: 'my-pass-state', // the custom state name for the Pass state, defaults to 'Filter input and inject data' as the state name
   parameters: { // input to the pass state
     input: sfn.JsonPath.stringAt('$.input.greeting'),
     otherData: 'some-extra-stuff',
@@ -307,13 +304,12 @@ Learn more about the [Pass state](https://docs.aws.amazon.com/step-functions/lat
 
 A `Wait` state waits for a given number of seconds, or until the current time
 hits a particular time. The time to wait may be taken from the execution's JSON
-state. You can also add custom state name to Wait state.
+state.
 
 ```ts
 // Wait until it's the time mentioned in the the state object's "triggerTime"
 // field.
 const wait = new sfn.Wait(this, 'Wait For Trigger Time', {
-  stateName: 'new-wait-state',
   time: sfn.WaitTime.timestampPath('$.triggerTime'),
 });
 

packages/aws-cdk-lib/aws-stepfunctions/lib/states/choice.ts

@@ -54,7 +54,7 @@ export class Choice extends State {
   public readonly endStates: INextable[] = [];
 
   constructor(scope: Construct, id: string, props: ChoiceProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
   }
 
   /**

packages/aws-cdk-lib/aws-stepfunctions/lib/states/fail.ts

@@ -64,7 +64,7 @@ export class Fail extends State {
   private readonly causePath?: string;
 
   constructor(scope: Construct, id: string, props: FailProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
 
     this.error = props.error;
     this.errorPath = props.errorPath;

packages/aws-cdk-lib/aws-stepfunctions/lib/states/map.ts

@@ -124,7 +124,7 @@ export class Map extends State implements INextable {
   private readonly itemsPath?: string;
 
   constructor(scope: Construct, id: string, props: MapProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
     this.endStates = [this];
     this.maxConcurrency = props.maxConcurrency;
     this.itemsPath = props.itemsPath;

packages/aws-cdk-lib/aws-stepfunctions/lib/states/parallel.ts

@@ -81,7 +81,7 @@ export class Parallel extends State implements INextable {
   private readonly _branches: IChainable[] = [];
 
   constructor(scope: Construct, id: string, props: ParallelProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
 
     this.endStates = [this];
   }

packages/aws-cdk-lib/aws-stepfunctions/lib/states/pass.ts

@@ -131,7 +131,7 @@ export class Pass extends State implements INextable {
   private readonly result?: Result;
 
   constructor(scope: Construct, id: string, props: PassProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
 
     this.result = props.result;
     this.endStates = [this];

packages/aws-cdk-lib/aws-stepfunctions/lib/states/state.ts

@@ -198,7 +198,7 @@ export abstract class State extends Construct implements IChainable {
   private readonly incomingStates: State[] = [];
 
   constructor(scope: Construct, id: string, props: StateProps) {
-    super(scope, props.stateName? props.stateName: id);
+    super(scope, id);
 
     this.startState = this;
 
@@ -228,7 +228,7 @@ export abstract class State extends Construct implements IChainable {
    * Tokenized string that evaluates to the state's ID
    */
   public get stateId(): string {
-    return this.prefixes.concat(this.id).join('');
+    return this.prefixes.concat(this.stateName? this.stateName: this.id).join('');
   }
 
   /**

packages/aws-cdk-lib/aws-stepfunctions/lib/states/succeed.ts

@@ -52,7 +52,7 @@ export class Succeed extends State {
   public readonly endStates: INextable[] = [];
 
   constructor(scope: Construct, id: string, props: SucceedProps = {}) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
   }
 
   /**

packages/aws-cdk-lib/aws-stepfunctions/lib/states/task-base.ts

@@ -157,7 +157,7 @@ export abstract class TaskStateBase extends State implements INextable {
   private readonly credentials?: Credentials;
 
   constructor(scope: Construct, id: string, props: TaskStateBaseProps) {
-    super(scope, props.stateName ? props.stateName: id, props);
+    super(scope, id, props);
 
     this.endStates = [this];
     this.timeout = props.timeout;

packages/aws-cdk-lib/aws-stepfunctions/lib/states/task.ts

@@ -117,7 +117,7 @@ export class Task extends State implements INextable {
   private readonly taskProps: StepFunctionsTaskConfig;
 
   constructor(scope: Construct, id: string, props: TaskProps) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
 
     this.timeout = props.timeout;
     const taskProps = props.task.bind(this);

packages/aws-cdk-lib/aws-stepfunctions/lib/states/wait.ts

@@ -81,7 +81,7 @@ export class Wait extends State implements INextable {
   private readonly time: WaitTime;
 
   constructor(scope: Construct, id: string, props: WaitProps) {
-    super(scope, props.stateName? props.stateName: id, props);
+    super(scope, id, props);
 
     this.time = props.time;
     this.endStates = [this];