@lafken/state-machine 0.11.0 → 0.11.1

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

@@ -1,4 +1,5 @@
 import { type ClassResource } from '@lafken/common';
+import type { TerraformResource } from 'cdktn';
 import type { Construct } from 'constructs';
 import type { BucketPermission, DefinitionSchema, SchemaProps } from './schema.types';
 export declare class Schema {
@@ -12,8 +13,10 @@ export declare class Schema {
     private lambdaStates;
     private unresolvedDependency;
     private bucketPermissions;
+    private lambdaResources;
     constructor(scope: Construct, resource: ClassResource, props?: SchemaProps);
-    getDefinition(): DefinitionSchema;
+    get definition(): DefinitionSchema;
+    get resources(): TerraformResource[];
     resolveArguments(definition: DefinitionSchema): Promise<DefinitionSchema>;
     get hasUnresolvedDependency(): boolean;
     get buckets(): BucketPermission;

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

@@ -16,6 +16,7 @@ class Schema {
     lambdaStates;
     unresolvedDependency = false;
     bucketPermissions = {};
+    lambdaResources = [];
     constructor(scope, resource, props = {}) {
         this.scope = scope;
         this.resource = resource;
@@ -24,13 +25,16 @@ class Schema {
         this.lambdaStates = props.lambdas || new schema_utils_1.LambdaStates();
         this.getMetadata(props.initializeAssets ?? false);
     }
-    getDefinition() {
+    get definition() {
         const startName = this.getNextState(this.resourceMetadata.startAt);
         return {
             StartAt: startName,
             States: this.states,
         };
     }
+    get resources() {
+        return this.lambdaResources;
+    }
     async resolveArguments(definition) {
         for (const key in definition.States) {
             const state = definition.States[key];
@@ -139,7 +143,8 @@ class Schema {
                         stateNames: this.stateNames,
                         minify: this.props.minify,
                     });
-                    branchStates.push(branchSchema.getDefinition());
+                    this.resources.push(...this.resources);
+                    branchStates.push(branchSchema.definition);
                     this.mergeBucketPermissions(branchSchema.buckets);
                     this.setUnresolvedDependency(branchSchema.unresolvedDependency);
                 }
@@ -162,8 +167,9 @@ class Schema {
                     stateNames: this.stateNames,
                     minify: this.props.minify,
                 });
+                this.resources.push(...this.resources);
                 this.mergeBucketPermissions(mapSchema.buckets);
-                const mapState = mapSchema.getDefinition();
+                const mapState = mapSchema.definition;
                 this.setUnresolvedDependency(mapSchema.hasUnresolvedDependency);
                 const itemProcessor = {
                     ...mapState,
@@ -279,6 +285,7 @@ class Schema {
                 suffix: 'states',
             },
         ]);
+        this.resources.push(lambdaHandler);
         return {
             Resource: 'arn:aws:states:::lambda:invoke',
             Arguments: {

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

@@ -15,5 +15,6 @@ export declare class StateMachine extends StateMachine_base {
     private overrideDefinition;
     private overrideRole;
     private addLoggingConfiguration;
+    private addDependency;
 }
 export {};

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

@@ -4,6 +4,7 @@ exports.StateMachine = void 0;
 const cloudwatch_log_group_1 = require("@cdktn/provider-aws/lib/cloudwatch-log-group");
 const sfn_state_machine_1 = require("@cdktn/provider-aws/lib/sfn-state-machine");
 const resolver_1 = require("@lafken/resolver");
+const cdktn_1 = require("cdktn");
 const schema_1 = require("./schema/schema");
 class StateMachine extends resolver_1.lafkenResource.make(sfn_state_machine_1.SfnStateMachine) {
     props;
@@ -27,14 +28,16 @@ class StateMachine extends resolver_1.lafkenResource.make(sfn_state_machine_1.Sf
     async attachDefinition() {
         const { classResource } = this.props;
         const schema = new schema_1.Schema(this, classResource, { minify: this.props.minify });
-        const definition = await schema.getDefinition();
+        const definition = await schema.definition;
         this.overrideRole(schema);
         if (!schema.hasUnresolvedDependency) {
             this.overrideDefinition(definition);
+            this.addDependency(...schema.resources);
         }
-        if (schema.hasUnresolvedDependency) {
+        else {
             this.isDependent(async () => {
                 this.overrideDefinition(await schema.resolveArguments(definition));
+                this.addDependency(...schema.resources);
             });
         }
     }
@@ -76,6 +79,7 @@ class StateMachine extends resolver_1.lafkenResource.make(sfn_state_machine_1.Sf
             },
             principal: 'states.amazonaws.com',
         });
+        this.addDependency(role, role.policy);
         this.addOverride('role_arn', role.arn);
     }
     addLoggingConfiguration(resourceMetadata) {
@@ -91,6 +95,13 @@ class StateMachine extends resolver_1.lafkenResource.make(sfn_state_machine_1.Sf
             level: resourceMetadata.loggingConfiguration.level?.toUpperCase(),
             logDestination: `${logGroup.arn}:*`,
         });
+        this.addDependency(logGroup);
+    }
+    addDependency(...resource) {
+        this.dependsOn = [
+            ...(this.dependsOn || []),
+            ...resource.map((res) => (0, cdktn_1.dependable)(res)),
+        ];
     }
 }
 exports.StateMachine = StateMachine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/state-machine",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "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.0"
+    "@lafken/resolver": "0.11.1"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.5.0",
@@ -63,13 +63,13 @@
     "typescript": "6.0.2",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.2",
-    "@lafken/common": "0.11.0"
+    "@lafken/common": "0.11.1"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.11.0"
+    "@lafken/common": "0.11.1"
   },
   "engines": {
     "node": ">=20.19"