@fy-stack/fullstack-construct 0.0.142 → 0.0.144

package/README.md

@@ -1,64 +1,75 @@
 # Fullstack Construct Documentation
 
-## `FullstackConstruct`
+## Overview
 
-### Example
-```typescript
-import {
-  AppGrant,
-  AppType,
-  FullStackConstruct,
-} from '@fy-stack/fullstack-construct';
+The Fullstack Construct is a high-level AWS CDK construct that enables deploying full-stack applications to AWS infrastructure. It provides an integrated solution for deploying various types of applications with their associated infrastructure.
+
+## Supported Application Types
+
+### 1. Static Applications
+- **Static Website** (`AppType.STATIC_WEBSITE`)
+    - Simple static websites with HTML, CSS, and JavaScript
+    - Deployed to S3 and served via CloudFront
+
+### 2. Next.js Applications
+- **Next.js Pages Export** (`AppType.NEXT_PAGE_EXPORT`)
+    - Static export mode of Next.js applications
+    - Optimized for static site generation
+- **Next.js App Router** (`AppType.NEXT_APP_ROUTER`)
+    - Support for the newer App Router architecture
+    - Includes handling for server components
+
+### 3. Node.js Applications
+- **Node App** (`AppType.NODE_APP`)
+    - General purpose Node.js applications
+    - Deployable as containers or Lambda functions
+- **Node API** (`AppType.NODE_API`)
+    - Specialized for NestJS API applications
+    - Includes API Gateway integration
+
+### 4. Container Applications
+- **Image App** (`AppType.IMAGE_APP`)
+    - Docker container-based applications
+    - Deployable to ECS with Fargate
+
+## Deployment Options
 
-new FullStackConstruct(this, 'FullstackApp', {
-  appId: `unique-app-id`,
-  apps: {
-    api: {
-      type: AppType.NODE_API,
-      output: process.cwd() + '/dist/apps/api',
-      buildParams: { command: 'node main.js' },
-      attachment: { secrets: true },
-      grant: [AppGrant.EVENT, AppGrant.SECRETS],
-    },
-    eventHandler: {
-      type: AppType.NODE_APP,
-      output: process.cwd() + '/dist/apps/event-handler',
-      buildParams: { handler: 'main.handler' },
-      attachment: { secrets: true, queue: { batchSize: 10 } },
-      grant: [AppGrant.SECRETS],
-    },
-    web: {
-      type: AppType.NEXT_PAGE_EXPORT,
-      output: process.cwd() + '/dist/apps/web',
-    },
-  },
-  secrets: {
-    SOME_OTHER_ENV: "envValue"
-  },
-  events: {
-    messages: [
-      { messages: [EventType.DAILY_SPOOL], $resource: 'eventHandler' },
-    ],
-    cron: [
-      {
-        messages: [EventType.DAILY_SPOOL],
-        cron: { hour: '0', minute: '0' },
-      },
-    ],
-  },
-  cdn: {
-    routes: {
-      '/*': { $resource: 'web' },
-    },
-    domains: [
-      { domain: 'example.com', records: ['*', 'www'] }, 
-      { domain: 'example.com.ng', records: ['*', 'www'] },
-    ],
-  },
-  api: {
-    routes: {
-      '/*': { $resource: 'api' },
+### 1. Lambda Deployment
+- Suitable for serverless applications
+- Configurable memory and timeout settings
+- Environment variable support
+- Example configuration:
+
+```typescript
+{ 
+  type: AppType.NODE_API,
+  buildParams: {
+    memorySize: 512,
+      timeout: 30,
+      environment: {
+      NODE_ENV: 'production'
     }
   }
-})
+}
+```
+
+
+### 2. ECS Deployment
+- Container-based deployment with Fargate
+- Supports both service and task patterns
+- Load balancer integration
+- Example configuration:
+
+```typescript
+{ 
+  server: { 
+    apps: {
+      api: { 
+        type: AppType.NODE_API,
+        // ECS-specific configuration 
+      }
+    }, 
+    loadBalancer: { 
+// Load balancer configuration
+    } }, tasks: { // Background task configurations } }
 ```

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export { FullStackConstruct } from './lib/fullstack-construct';
-export { type AppAttachment, AppGrant, AppType } from "./lib/types";
+export { type AppAttachment, type FullStackConstructProps } from './lib/types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppType = exports.AppGrant = exports.FullStackConstruct = void 0;
+exports.FullStackConstruct = void 0;
 var fullstack_construct_1 = require("./lib/fullstack-construct");
 Object.defineProperty(exports, "FullStackConstruct", { enumerable: true, get: function () { return fullstack_construct_1.FullStackConstruct; } });
-var types_1 = require("./lib/types");
-Object.defineProperty(exports, "AppGrant", { enumerable: true, get: function () { return types_1.AppGrant; } });
-Object.defineProperty(exports, "AppType", { enumerable: true, get: function () { return types_1.AppType; } });

package/dist/lib/fullstack-construct.d.ts

@@ -1,30 +1,36 @@
 import { ApiGatewayConstruct } from '@fy-stack/apigateway-construct';
-import { type AppConstruct } from '@fy-stack/app-construct';
+import { EcsConstruct, LambdaConstruct, StaticConstruct } from '@fy-stack/app-construct';
 import { AuthConstruct } from '@fy-stack/auth-construct';
 import { CDNConstruct } from '@fy-stack/cdn-construct';
 import { DatabaseConstruct } from '@fy-stack/database-construct';
 import { EventConstruct } from '@fy-stack/event-construct';
 import { SecretsConstruct } from '@fy-stack/secret-construct';
 import { StorageConstruct } from '@fy-stack/storage-construct';
-import { TaskConstruct } from '@fy-stack/task-construct';
+import { AppGrant, Attach, Grant } from '@fy-stack/types';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { Construct } from 'constructs';
-import { FullStackConstructProps } from './types';
+import { AppAttachment, FullStackConstructProps } from './types';
 /**
  *
  */
 export declare class FullStackConstruct extends Construct {
     vpc: ec2.IVpc;
+    owner?: iam.IUser | iam.IRole;
     auth?: AuthConstruct;
     storage?: StorageConstruct;
     storagePolicy?: string;
     database?: DatabaseConstruct;
     event?: EventConstruct;
-    apps?: Record<string, AppConstruct>;
-    tasks?: Record<string, TaskConstruct>;
+    ecs?: EcsConstruct;
+    lambda?: LambdaConstruct;
+    static?: StaticConstruct;
     cdn?: CDNConstruct;
     api?: ApiGatewayConstruct;
     secret: SecretsConstruct;
     constructor(scope: Construct, id: string, props: FullStackConstructProps);
+    fromAttachments(attach: Attach, attachment?: AppAttachment): void;
+    fromGrants(grant: Grant, grants?: AppGrant[]): void;
+    ownerFromArn(ownerArn?: string): iam.IUser | iam.IRole | undefined;
 }
 //# sourceMappingURL=fullstack-construct.d.ts.map

package/dist/lib/fullstack-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fullstack-construct.d.ts","sourceRoot":"","sources":["../../src/lib/fullstack-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EACL,KAAK,YAAY,EAOlB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAW,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAW3D;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IACxC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;CAsLzE"}
+{"version":3,"file":"fullstack-construct.d.ts","sourceRoot":"","sources":["../../src/lib/fullstack-construct.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAa,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAEjE;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IACxC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IAC9B,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;IAwNxE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,aAAa;IAU1D,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE;IAW5C,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM;CAgB/B"}

package/dist/lib/fullstack-construct.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FullStackConstruct = void 0;
 const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("node:path"));
 const apigateway_construct_1 = require("@fy-stack/apigateway-construct");
 const app_construct_1 = require("@fy-stack/app-construct");
 const auth_construct_1 = require("@fy-stack/auth-construct");
@@ -10,37 +11,30 @@ const database_construct_1 = require("@fy-stack/database-construct");
 const event_construct_1 = require("@fy-stack/event-construct");
 const secret_construct_1 = require("@fy-stack/secret-construct");
 const storage_construct_1 = require("@fy-stack/storage-construct");
-const task_construct_1 = require("@fy-stack/task-construct");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const ec2 = tslib_1.__importStar(require("aws-cdk-lib/aws-ec2"));
-const ecs = tslib_1.__importStar(require("aws-cdk-lib/aws-ecs"));
+const iam = tslib_1.__importStar(require("aws-cdk-lib/aws-iam"));
 const constructs_1 = require("constructs");
-const types_1 = require("./types");
-const AppBuilds = {
-    [types_1.AppType.NEXT_APP_ROUTER]: app_construct_1.NextAppRouterConstruct,
-    [types_1.AppType.NEXT_PAGE_EXPORT]: app_construct_1.NextPagesExportConstruct,
-    [types_1.AppType.NODE_APP]: app_construct_1.NodeAppConstruct,
-    [types_1.AppType.NODE_API]: app_construct_1.NodeApiConstruct,
-    [types_1.AppType.IMAGE_APP]: app_construct_1.ImageAppConstruct,
-    [types_1.AppType.STATIC_WEBSITE]: app_construct_1.StaticWebsiteConstruct,
-};
 /**
  *
  */
 class FullStackConstruct extends constructs_1.Construct {
     vpc;
+    owner;
     auth;
     storage;
     storagePolicy;
     database;
     event;
-    apps;
-    tasks;
+    ecs;
+    lambda;
+    static;
     cdn;
     api;
     secret;
     constructor(scope, id, props) {
         super(scope, id);
+        this.owner = this.ownerFromArn(props.ownerArn);
         this.vpc = ec2.Vpc.fromLookup(this, 'VPC', props.vpcId ? { vpcId: props.vpcId } : { isDefault: true });
         if (props.auth) {
             this.auth = new auth_construct_1.AuthConstruct(this, 'AuthConstruct', {
@@ -57,117 +51,180 @@ class FullStackConstruct extends constructs_1.Construct {
                 vpcId: this.vpc.vpcId,
             });
         }
-        if (props.apps) {
-            const apps = {};
-            Object.assign(apps, Object.fromEntries(Object.entries(props.apps).map(([key, app]) => {
-                const AppTypeConstruct = AppBuilds[app.type];
-                return [
-                    key,
-                    new AppTypeConstruct(this, `${key}App`, {
-                        // @ts-expect-error invalid params
-                        buildParams: AppTypeConstruct.parse(app.buildParams ?? {}),
-                        vpc: this.vpc,
-                        ...app
-                    }),
-                ];
-            })));
-            this.apps = apps;
-        }
-        if (props.task) {
-            const tasks = {};
-            const cluster = new ecs.Cluster(this, 'AppCluster', { vpc: this.vpc });
-            Object.assign(tasks, Object.fromEntries(Object.entries(props.task).map(([key, task]) => {
-                return [
-                    key,
-                    new task_construct_1.TaskConstruct(this, `${key}Task`, {
-                        clusterArn: cluster.clusterArn,
-                        vpc: this.vpc,
-                        ...task
-                    }),
-                ];
-            })));
-            this.tasks = tasks;
-        }
-        if (props.events) {
+        if (props.ecs) {
+            this.ecs = new app_construct_1.EcsConstruct(this, 'EcsConstruct', {
+                vpc: this.vpc,
+                environmentPath: path.join('/', props.name, '/', props.environment),
+                environment: props.environment,
+                ...props.ecs,
+            });
+        }
+        if (props.lambda) {
+            this.lambda = new app_construct_1.LambdaConstruct(this, 'LambdaConstruct', {
+                vpc: this.vpc,
+                apps: props.lambda,
+            });
+        }
+        if (props.static) {
+            this.static = new app_construct_1.StaticConstruct(this, 'StaticConstruct', {
+                apps: props.static,
+            });
+        }
+        const resources = {
+            ...(this.ecs?.server?.apps ?? {}),
+            ...(this.lambda?.apps ?? {}),
+            ...(this.static?.apps ?? {}),
+        };
+        if (props.event) {
             this.event = new event_construct_1.EventConstruct(this, 'EventConstruct', {
-                resources: { ...this.apps, ...this.tasks },
-                ...props.events,
+                resources: {
+                    ...(this.lambda?.apps ?? {}),
+                    ...(this.ecs?.tasks ?? {}),
+                },
+                ...props.event,
             });
         }
-        this.secret = new secret_construct_1.SecretsConstruct(this, 'SecretConstruct', {
-            resources: {
-                auth: this.auth,
-                database: this.database,
-                storage: this.storage,
-                event: this.event,
-            },
-            secrets: props.secrets,
-        });
         if (props.cdn) {
             this.cdn = new cdn_construct_1.CDNConstruct(this, 'CDNConstruct', {
                 routes: props.cdn.routes,
                 domains: props.cdn.domains,
-                resources: { ...this.apps, storage: this.storage },
-            });
-            new aws_cdk_lib_1.CfnOutput(this, 'CDN Url', {
-                key: 'cdnURl',
-                value: 'https://' + this.cdn.distribution.domainName,
+                resources: {
+                    ...resources,
+                    storage: this.storage,
+                },
             });
+            if (props.outputs) {
+                new aws_cdk_lib_1.CfnOutput(this, 'CDN Url', {
+                    key: 'cdnURl',
+                    value: 'https://' + this.cdn.distribution.domainName,
+                });
+            }
         }
         if (props.api) {
             this.api = new apigateway_construct_1.ApiGatewayConstruct(this, 'ApiConstruct', {
                 routes: props.api.routes,
-                resources: this.apps,
+                resources,
             });
-            if (this.api.api.url) {
+            if (this.api.api.url && props.outputs) {
                 new aws_cdk_lib_1.CfnOutput(this, 'Api Url', {
                     key: 'apiUrl',
                     value: this.api.api.url,
                 });
             }
         }
-        const resources = {
-            storage: this.storage,
-            database: this.database,
-            auth: this.auth,
-            secrets: this.secret,
-            event: this.event,
-        };
+        this.secret = new secret_construct_1.SecretsConstruct(this, 'SecretConstruct', {
+            resources: {
+                auth: this.auth,
+                database: this.database,
+                storage: this.storage,
+                event: this.event,
+                cdn: this.cdn,
+                api: this.api,
+            },
+            secrets: {
+                REGION: aws_cdk_lib_1.Stack.of(this).region,
+                ENVIRONMENT: props.environment,
+                ...props.secret,
+            },
+        });
+        if (props.outputs) {
+            new aws_cdk_lib_1.CfnOutput(this, 'SecretsName', {
+                key: 'appSecrets',
+                value: this.secret.secrets.secretName,
+            });
+        }
+        if (this.ecs && props.ecs) {
+            if (this.ecs.server) {
+                this.fromGrants(this.ecs.server, props.ecs.server?.grants);
+                for (const i in this.ecs.server.apps) {
+                    if (!props.ecs.server?.apps[i].attachment)
+                        continue;
+                    this.fromAttachments(this.ecs.server.apps[i], props.ecs.server.apps[i].attachment);
+                }
+            }
+            for (const i in this.ecs.tasks) {
+                if (props.ecs.tasks[i]?.grants) {
+                    this.fromGrants(this.ecs.tasks[i], props.ecs.tasks[i]?.grants);
+                }
+                if (props.ecs.tasks[i]?.attachment) {
+                    this.fromAttachments(this.ecs.tasks[i], props.ecs.tasks[i]?.attachment);
+                }
+            }
+        }
+        if (this.lambda && props.lambda) {
+            for (const i in this.lambda.apps) {
+                if (props.lambda[i].attachment) {
+                    this.fromAttachments(this.lambda.apps[i], props.lambda[i].attachment);
+                }
+                if (props.lambda[i].grants) {
+                    this.fromGrants(this.lambda.apps[i], props.lambda[i].grants);
+                }
+            }
+        }
         if (this.storage && this.cdn) {
             this.storagePolicy = JSON.stringify(this.storage.cloudfrontPolicy(this.cdn.distribution.distributionId));
             new aws_cdk_lib_1.CfnOutput(this, 'StorageBucketCDNPolicy', {
                 key: 'storageBucketCDNPolicy',
-                value: this.storagePolicy
+                value: this.storagePolicy,
             });
         }
-        for (const i in props.apps) {
-            const attachments = Object.entries(props.apps[i]?.attachment ?? {})
-                .map(([key]) => [key, resources[key]])
-                .filter((v) => !!v);
-            if (attachments.length) {
-                this.apps?.[i]?.attach(Object.fromEntries(attachments));
-            }
-            const grants = props.apps[i]?.grant
-                ?.map((val) => resources[val])
-                .filter((v) => !!v) ?? [];
-            if (grants.length) {
-                this.apps?.[i]?.grant(...grants);
+        aws_cdk_lib_1.Tags.of(this).add('App', props.name);
+        aws_cdk_lib_1.Tags.of(this).add('Environment', props.environment);
+        if (this.owner) {
+            this.owner.addToPrincipalPolicy(new iam.PolicyStatement({
+                effect: iam.Effect.ALLOW,
+                actions: ['*'],
+                resources: ['*'],
+                conditions: {
+                    StringEquals: {
+                        'aws:ResourceTag/App': props.name,
+                        'aws:ResourceTag/Environment': props.environment,
+                    },
+                },
+            }));
+            if (this.storage) {
+                this.storage.bucket.addToResourcePolicy(new iam.PolicyStatement({
+                    actions: ['*'],
+                    resources: [
+                        'arn:aws:s3:::' + this.storage.bucket.bucketName + '/*',
+                    ],
+                    principals: [this.owner],
+                }));
+                this.owner.addToPrincipalPolicy(new iam.PolicyStatement({
+                    actions: ['s3:*'],
+                    resources: [this.storage.bucket.bucketArn],
+                }));
             }
         }
-        for (const i in props.task) {
-            const attachments = Object.entries(props.task[i]?.attachment ?? {})
-                .map(([key]) => [key, resources[key]])
-                .filter((v) => !!v);
-            if (attachments.length) {
-                this.tasks?.[i]?.attach(Object.fromEntries(attachments));
-            }
-            const grants = props.task[i]?.grant
-                ?.map((val) => resources[val])
-                .filter((v) => !!v) ?? [];
-            if (grants.length) {
-                this.tasks?.[i]?.grant(...grants);
-            }
+    }
+    fromAttachments(attach, attachment) {
+        const builtAttachment = Object.entries(attachment ?? {})
+            .map(([key]) => [key, this[key]])
+            .filter((v) => !!v && !!v[1]);
+        if (builtAttachment.length) {
+            attach.attach(Object.fromEntries(builtAttachment));
+        }
+    }
+    fromGrants(grant, grants) {
+        const builtGrants = grants
+            ?.map((val) => this[val])
+            .filter((v) => !!v) ?? [];
+        if (builtGrants.length) {
+            grant.grant(...builtGrants);
+        }
+    }
+    ownerFromArn(ownerArn) {
+        if (!ownerArn)
+            return;
+        const [arn] = ownerArn.split('/');
+        const resourceType = arn.split(':').at(-1);
+        if (resourceType === 'user') {
+            return iam.User.fromUserArn(this, 'Owner', ownerArn);
+        }
+        if (resourceType === 'role') {
+            return iam.Role.fromRoleArn(this, 'Owner', ownerArn);
         }
+        return;
     }
 }
 exports.FullStackConstruct = FullStackConstruct;

package/dist/lib/types.d.ts

@@ -1,63 +1,51 @@
+import type { EcsConstructProps, LambdaConstructProps, StaticConstructProps } from '@fy-stack/app-construct';
 import type { CDNConstructProps } from '@fy-stack/cdn-construct';
 import type { DatabaseConstructProps } from '@fy-stack/database-construct';
 import type { EventConstructProps } from '@fy-stack/event-construct';
 import type { StorageConstructProps } from '@fy-stack/storage-construct';
-import type { TaskConstructsProps } from '@fy-stack/task-construct';
-import type { ResourceRef } from '@fy-stack/types';
-export declare enum AppType {
-    NODE_APP = "nodeApp",
-    NODE_API = "nestApi",
-    IMAGE_APP = "imageApp",
-    NEXT_APP_ROUTER = "nextAppRouter",
-    NEXT_PAGE_EXPORT = "nextPageExport",
-    STATIC_WEBSITE = "staticWebsite"
-}
+import { AppGrant, type ResourceRef } from '@fy-stack/types';
 export type AppAttachment = {
     auth?: boolean;
     storage?: boolean;
     database?: boolean;
-    secrets?: boolean;
-    queue?: {
-        batchSize?: number;
-    };
-};
-export declare enum AppGrant {
-    AUTH = "auth",
-    STORAGE = "storage",
-    DATABASE = "database",
-    SECRETS = "secrets",
-    EVENT = "event"
-}
-export type App = {
-    type: AppType;
-    output: string;
-    attachment?: AppAttachment;
-    grant?: AppGrant[];
-    env?: Record<string, string>;
-    buildParams?: Record<string, unknown>;
-};
-export type Task = Omit<TaskConstructsProps, "clusterArn" | "vpc"> & {
-    attachment?: AppAttachment;
-    grant?: AppGrant[];
+    secret?: boolean;
 };
 export type AppMessage = ResourceRef & {
     messages: string[];
 };
 export type FullStackConstructProps = {
+    name: string;
+    environment: string;
     vpcId?: string;
-    appId: string;
     auth?: {
         groups?: string[];
     };
     storage?: StorageConstructProps;
     database?: DatabaseConstructProps;
-    apps?: Record<string, App>;
-    events?: Omit<EventConstructProps, "resources">;
-    cdn?: Omit<CDNConstructProps, "resources">;
+    ecs?: Omit<EcsConstructProps, 'vpc' | 'environmentPath' | 'server' | 'tasks' | 'environment'> & {
+        server: Omit<NonNullable<EcsConstructProps['server']>, 'apps'> & {
+            grants?: AppGrant[];
+            apps: Record<string, NonNullable<EcsConstructProps['server']>['apps'][string] & {
+                attachment?: AppAttachment;
+            }>;
+        };
+        tasks: Record<string, NonNullable<EcsConstructProps['tasks']>[string] & {
+            grants?: AppGrant[];
+            attachment?: AppAttachment;
+        }>;
+    };
+    lambda?: Record<string, NonNullable<LambdaConstructProps['apps']>[string] & {
+        grants?: AppGrant[];
+        attachment?: AppAttachment;
+    }>;
+    static?: StaticConstructProps['apps'];
+    event?: Omit<EventConstructProps, 'resources'>;
+    cdn?: Omit<CDNConstructProps, 'resources'>;
     api?: {
         routes: Record<string, ResourceRef>;
     };
-    secrets?: Record<string, string | undefined>;
-    task?: Record<string, Task>;
+    secret?: Record<string, string | undefined>;
+    outputs?: boolean;
+    ownerArn?: string;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,oBAAY,OAAO;IACjB,QAAQ,YAAY;IACpB,QAAQ,YAAY;IACpB,SAAS,aAAa;IACtB,eAAe,kBAAkB;IACjC,gBAAgB,mBAAmB;IACnC,cAAc,kBAAkB;CACjC;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAChC,CAAC;AAEF,oBAAY,QAAQ;IAClB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,KAAK,CAAC,GAAG;IACnE,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IACrC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;KAAE,CAAC;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC7B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IACrC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,GAAG,CAAC,EAAE,IAAI,CACR,iBAAiB,EACjB,KAAK,GAAG,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,aAAa,CAC/D,GAAG;QACF,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;YAC/D,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;YACpB,IAAI,EAAE,MAAM,CACV,MAAM,EACN,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG;gBACzD,UAAU,CAAC,EAAE,aAAa,CAAC;aAC5B,CACF,CAAC;SACH,CAAC;QACF,KAAK,EAAE,MAAM,CACX,MAAM,EACN,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;YAChD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;YACpB,UAAU,CAAC,EAAE,aAAa,CAAC;SAC5B,CACF,CAAC;KACH,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CACb,MAAM,EACN,WAAW,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;QAClD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;QACpB,UAAU,CAAC,EAAE,aAAa,CAAC;KAC5B,CACF,CAAC;IACF,MAAM,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;IAC/C,GAAG,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;KAAE,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/lib/types.js

@@ -1,20 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppGrant = exports.AppType = void 0;
-var AppType;
-(function (AppType) {
-    AppType["NODE_APP"] = "nodeApp";
-    AppType["NODE_API"] = "nestApi";
-    AppType["IMAGE_APP"] = "imageApp";
-    AppType["NEXT_APP_ROUTER"] = "nextAppRouter";
-    AppType["NEXT_PAGE_EXPORT"] = "nextPageExport";
-    AppType["STATIC_WEBSITE"] = "staticWebsite";
-})(AppType || (exports.AppType = AppType = {}));
-var AppGrant;
-(function (AppGrant) {
-    AppGrant["AUTH"] = "auth";
-    AppGrant["STORAGE"] = "storage";
-    AppGrant["DATABASE"] = "database";
-    AppGrant["SECRETS"] = "secrets";
-    AppGrant["EVENT"] = "event";
-})(AppGrant || (exports.AppGrant = AppGrant = {}));

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@fy-stack/fullstack-construct",
-  "version": "0.0.142",
+  "version": "0.0.144",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/apigateway-construct": "0.0.142",
-    "@fy-stack/app-construct": "0.0.142",
-    "@fy-stack/auth-construct": "0.0.142",
-    "@fy-stack/cdn-construct": "0.0.142",
-    "@fy-stack/database-construct": "0.0.142",
-    "@fy-stack/event-construct": "0.0.142",
-    "@fy-stack/secret-construct": "0.0.142",
-    "@fy-stack/storage-construct": "0.0.142",
-    "@fy-stack/task-construct": "0.0.142",
-    "tslib": "^2.3.0"
+    "@fy-stack/apigateway-construct": "0.0.144",
+    "@fy-stack/app-construct": "0.0.144",
+    "@fy-stack/auth-construct": "0.0.144",
+    "@fy-stack/cdn-construct": "0.0.144",
+    "@fy-stack/database-construct": "0.0.144",
+    "@fy-stack/event-construct": "0.0.144",
+    "@fy-stack/secret-construct": "0.0.144",
+    "@fy-stack/storage-construct": "0.0.144",
+    "tslib": "^2.3.0",
+    "@fy-stack/types": "0.0.144"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.174.1",
+    "aws-cdk-lib": "^2.198.0",
     "constructs": "^10.4.2"
   },
   "type": "commonjs",