@lafken/state-machine 0.11.9 → 0.11.11

package/lib/main/state-machine/state-machine.types.d.ts

@@ -716,7 +716,7 @@ interface MapReaderCSVItem extends MapReaderItemBase {
 }
 interface MapWriteResult {
     bucket: BucketNames;
-    prefix?: string;
+    prefix: string;
     config?: {
         outputType: 'JSON' | 'JSONL';
         transformation?: 'NONE' | 'COMPACT' | 'FLATTEN';

package/lib/resolver/state-machine/schema/schema.js

@@ -23,7 +23,7 @@ class Schema {
         this.props = props;
         this.stateNames = props.stateNames || new schema_utils_1.StateNames();
         this.lambdaStates = props.lambdas || new schema_utils_1.LambdaStates();
-        this.getMetadata(props.initializeAssets ?? false);
+        this.getMetadata(props.initializeAssets ?? false, props.minify);
     }
     get definition() {
         const startName = this.getNextState(this.resourceMetadata.startAt);
@@ -128,7 +128,7 @@ class Schema {
                     Type: 'Pass',
                     Assign: currentState.assign,
                     Output: currentState.output,
-                    End: currentState.end,
+                    End: currentState.next !== undefined ? undefined : currentState.end,
                     Next: this.getNextState(currentState.next, currentState.end),
                 };
                 break;
@@ -143,7 +143,7 @@ class Schema {
                         stateNames: this.stateNames,
                         minify: this.props.minify,
                     });
-                    this.resources.push(...this.resources);
+                    this.lambdaResources.push(...branchSchema.resources);
                     branchStates.push(branchSchema.definition);
                     this.mergeBucketPermissions(branchSchema.buckets);
                     this.setUnresolvedDependency(branchSchema.unresolvedDependency);
@@ -153,7 +153,7 @@ class Schema {
                     Arguments: this.getParallelArguments(currentState.arguments),
                     Output: currentState.output,
                     Assign: currentState.assign,
-                    End: currentState.end ?? currentState.next === undefined,
+                    End: currentState.next !== undefined ? undefined : (currentState.end ?? true),
                     Next: this.getNextState(currentState.next, currentState.end),
                     Branches: branchStates,
                 };
@@ -167,7 +167,7 @@ class Schema {
                     stateNames: this.stateNames,
                     minify: this.props.minify,
                 });
-                this.resources.push(...this.resources);
+                this.lambdaResources.push(...mapSchema.resources);
                 this.mergeBucketPermissions(mapSchema.buckets);
                 const mapState = mapSchema.definition;
                 this.setUnresolvedDependency(mapSchema.hasUnresolvedDependency);
@@ -180,8 +180,10 @@ class Schema {
                 const mapTask = {
                     Type: 'Map',
                     Items: currentState.items,
+                    ItemSelector: currentState.itemSelector,
+                    MaxConcurrency: currentState.maxCurrency,
                     ItemProcessor: itemProcessor,
-                    End: currentState.end ?? currentState.next === undefined,
+                    End: currentState.next !== undefined ? undefined : (currentState.end ?? true),
                     Next: this.getNextState(currentState.next, currentState.end),
                     Output: currentState.output,
                     Assign: currentState.assign,
@@ -239,8 +241,7 @@ class Schema {
                         mapTask.ToleratedFailureCount = currentState.toleratedFailureCount;
                     }
                     if (currentState.toleratedFailurePercentage) {
-                        mapTask.ToleratedFailurePercentage =
-                            currentState.toleratedFailurePercentage.toString();
+                        mapTask.ToleratedFailurePercentage = currentState.toleratedFailurePercentage;
                     }
                 }
                 this.states[stateName] = mapTask;
@@ -299,14 +300,14 @@ class Schema {
     addTaskState(handler) {
         const stateName = this.stateNames.createName(handler.name);
         if (this.states[stateName]) {
-            return handler.name;
+            return stateName;
         }
         const task = {
             Type: 'Task',
             Resource: '',
             Arguments: {},
             Next: this.getNextState(handler.next, handler.end),
-            End: handler.end,
+            End: handler.next !== undefined ? undefined : handler.end,
             Assign: handler.assign,
             ...(handler.integrationResource !== undefined
                 ? this.getIntegrationTask(handler)
@@ -419,10 +420,9 @@ class Schema {
         this.addRetry(state, stateName);
     }
     setUnresolvedDependency(unresolved) {
-        if (!this.unresolvedDependency || !unresolved) {
-            return;
+        if (unresolved) {
+            this.unresolvedDependency = true;
         }
-        this.unresolvedDependency = true;
     }
     mergeBucketPermissions(bucketPermissions) {
         for (const bucket in bucketPermissions) {

package/lib/resolver/state-machine/schema/schema.types.d.ts

@@ -87,8 +87,9 @@ export interface MapTask {
     ResultWriter?: ResultWriter;
     ItemBatcher?: ItemBatcher;
     Items?: any[] | string;
+    ItemSelector?: string | Record<string, any>;
     MaxConcurrency?: number;
-    ToleratedFailurePercentage?: string;
+    ToleratedFailurePercentage?: number | string;
     ToleratedFailureCount?: number;
     Output?: string | Record<string, any>;
     Assign?: Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/state-machine",
-  "version": "0.11.9",
+  "version": "0.11.11",
   "private": false,
   "description": "Build Step Functions workflows with TypeScript decorators - declarative orchestration with Lafken",
   "keywords": [
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.11.9"
+    "@lafken/resolver": "0.11.11"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.9.0",
@@ -63,13 +63,13 @@
     "typescript": "6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.5",
-    "@lafken/common": "0.11.9"
+    "@lafken/common": "0.11.11"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.11.9"
+    "@lafken/common": "0.11.11"
   },
   "engines": {
     "node": ">=20.19"