@takumi-stack/core 1.0.0 → 1.0.2

package/prefab/gateway/api-gateway/api-rest.d.ts

@@ -1,26 +1,45 @@
 import * as awsApigateway from 'aws-cdk-lib/aws-apigateway';
-import { UserPool } from 'aws-cdk-lib/aws-cognito';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
-import { Construct } from 'constructs';
-
-import { ServiceStack } from '../../../common';
-
-import { CdnApiPrefab } from '../../../prefab/cdn';
-
-export type ApiRestPrefabParams = {
-  basePath: string;
-  cdnApiPrefab?: CdnApiPrefab;
-  userPool?: UserPool;
-  customAuthorizerHandler?: IFunction;
-  stageName?: string;
-  stageVariables?: Record<string, string>;
-  httpProxyIntegrationUrl?: string;
-  apiKeyRequired?: boolean;
+import { ApiDefinition, ApiInterface } from '@takumi-stack/sdk';
+import { BaseCustomConfigs, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
+import { CognitoUserPoolPrefab } from '../../auth';
+import { CdnApiPrefab } from '../../cdn';
+import { ApiFunctionsPrefab, FunctionPrefab } from '../../compute';
+export type ApiRestPrefabParams<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> = {
+    name: string;
+    basePath?: string;
+    cdnApiPrefab?: CdnApiPrefab<CustomConfigs>;
+    authorizerConfig?: {
+        cognitoUserPoolPrefab?: CognitoUserPoolPrefab<CustomConfigs>;
+        lambdaAuthorizer?: FunctionPrefab<CustomConfigs>;
+    };
+    deployOptions?: awsApigateway.StageOptions;
+    httpProxyIntegration?: {
+        httpProxyIntegrationUrl?: string;
+        apiKeyRequired?: boolean;
+    };
+    resourceProps?: {
+        cognitoUserPoolPrefab?: Partial<awsApigateway.CognitoUserPoolsAuthorizerProps>;
+        lambdaAuthorizer?: Partial<awsApigateway.RequestAuthorizerProps>;
+        api?: Partial<awsApigateway.RestApiProps>;
+    };
+    existingResource?: {
+        apiId?: string;
+        api?: awsApigateway.RestApi;
+        authorizer?: awsApigateway.IAuthorizer;
+    };
 };
-export declare class ApiRestPrefab extends Construct {
-  readonly api: awsApigateway.RestApi;
-  readonly authorizer: awsApigateway.IAuthorizer;
-  readonly basePath: awsApigateway.Resource;
-  constructor(service: ServiceStack, params: ApiRestPrefabParams);
+export declare class ApiRestPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<ApiRestPrefabParams<CustomConfigs>, CustomConfigs> {
+    readonly apiUrl: string;
+    readonly basePath: string;
+    readonly basePathResource: awsApigateway.Resource;
+    readonly api: awsApigateway.RestApi;
+    readonly authorizer: awsApigateway.IAuthorizer | undefined;
+    constructor(service: TakumiStack<CustomConfigs>, params: ApiRestPrefabParams<CustomConfigs>, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+    addPath(params: {
+        apiDefinition: ApiDefinition<ApiInterface>;
+        apiFunctionsPrefab: ApiFunctionsPrefab<CustomConfigs>;
+        lambdaFunction: IFunction;
+    }): void;
 }
-//# sourceMappingURL=api-rest.d.ts.map
+//# sourceMappingURL=api-rest.d.ts.map

package/prefab/gateway/api-gateway/api-rest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-rest.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-rest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAmC,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,uBAAuB,CAAC,EAAE,SAAS,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAgB,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC;IAC3C,SAAgB,UAAU,EAAG,aAAa,CAAC,WAAW,CAAC;IACvD,SAAgB,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC;gBAErC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,mBAAmB;CAmE/D"}
+{"version":3,"file":"api-rest.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-rest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEnE,MAAM,MAAM,mBAAmB,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IAC7F,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAC3C,gBAAgB,CAAC,EAAE;QACjB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC7D,gBAAgB,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;KAClD,CAAC;IACF,aAAa,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC;IAC3C,oBAAoB,CAAC,EAAE;QACrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF,aAAa,CAAC,EAAE;QACd,qBAAqB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;QAC/E,gBAAgB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;QACjE,GAAG,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;KAC3C,CAAC;IACF,gBAAgB,CAAC,EAAE;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC;QAC5B,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC;KACxC,CAAC;CACH,CAAC;AAEF,qBAAa,aAAa,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACpG,mBAAmB,CAAC,aAAa,CAAC,EAClC,aAAa,CACd;IACC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,gBAAgB,EAAE,aAAa,CAAC,QAAQ,CAAC;IACzD,SAAgB,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC;IAC3C,SAAgB,UAAU,EAAE,aAAa,CAAC,WAAW,GAAG,SAAS,CAAC;gBAGhE,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAC1C,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAwE7C,OAAO,CAAC,MAAM,EAAE;QACrB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,kBAAkB,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;QACtD,cAAc,EAAE,SAAS,CAAC;KAC3B,GAAG,IAAI;CAsBT"}

package/prefab/gateway/api-gateway/api-rest.js

@@ -26,52 +26,57 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiRestPrefab = void 0;
 const awsApigateway = __importStar(require("aws-cdk-lib/aws-apigateway"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-class ApiRestPrefab extends constructs_1.Construct {
+class ApiRestPrefab extends common_1.Prefab {
+    apiUrl;
+    basePath;
+    basePathResource;
     api;
     authorizer;
-    basePath;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(ApiRestPrefab.name));
-        if (params.userPool) {
-            this.authorizer = new awsApigateway.CognitoUserPoolsAuthorizer(this, 'Authorizer', {
-                cognitoUserPools: [params.userPool],
+    constructor(service, params, propsOverride) {
+        super(ApiRestPrefab.name, service, params, propsOverride);
+        if (params.authorizerConfig?.cognitoUserPoolPrefab && params.authorizerConfig?.lambdaAuthorizer) {
+            throw new Error('Cannot specify both cognitoUserPoolPrefab and lambdaAuthorizer.');
+        }
+        this.authorizer = params.existingResource?.authorizer;
+        if (params.authorizerConfig?.cognitoUserPoolPrefab) {
+            this.authorizer = new awsApigateway.CognitoUserPoolsAuthorizer(this, this.getId('Authorizer'), {
+                cognitoUserPools: [params.authorizerConfig.cognitoUserPoolPrefab.userPool],
+                ...params.resourceProps?.cognitoUserPoolPrefab,
             });
         }
-        if (params.customAuthorizerHandler) {
-            this.authorizer = new awsApigateway.RequestAuthorizer(this, 'LambdaAuthorizer', {
+        if (params.authorizerConfig?.lambdaAuthorizer) {
+            this.authorizer = new awsApigateway.RequestAuthorizer(this, this.getId('LambdaAuthorizer'), {
                 identitySources: ['$request.header.Authorization'],
-                handler: params.customAuthorizerHandler,
+                handler: params.authorizerConfig?.lambdaAuthorizer.lambdaFunction,
+                ...params.resourceProps?.lambdaAuthorizer,
             });
         }
-        this.api = new awsApigateway.RestApi(this, 'RestApi', {
-            restApiName: (0, common_1.getResourceName)('', service.props),
-            deploy: true,
-            deployOptions: {
-                tracingEnabled: true,
-                stageName: params.stageName || 'default',
-                variables: params.stageVariables,
-            },
-            defaultCorsPreflightOptions: {
-                allowOrigins: awsApigateway.Cors.ALL_ORIGINS,
-            },
-        });
-        const apiUrl = aws_cdk_lib_1.Fn.join('', [this.api.restApiId, '.execute-api.', service.props.regionName, '.amazonaws.com']);
-        this.basePath = this.api.root.resourceForPath(params.basePath);
-        if (params.httpProxyIntegrationUrl) {
-            const proxy = this.basePath.addProxy({ anyMethod: false });
-            proxy.addMethod('ANY', new awsApigateway.HttpIntegration(params.httpProxyIntegrationUrl, {
+        this.api =
+            params.existingResource?.api ||
+                new awsApigateway.RestApi(this, this.getId('RestApi'), {
+                    restApiName: this.getResourceName('rest-api'),
+                    endpointConfiguration: { types: [awsApigateway.EndpointType.REGIONAL] },
+                    deploy: true,
+                    deployOptions: {
+                        stageName: 'default',
+                        ...params.deployOptions,
+                    },
+                    defaultCorsPreflightOptions: {
+                        allowOrigins: awsApigateway.Cors.ALL_ORIGINS,
+                    },
+                    ...params.resourceProps?.api,
+                });
+        this.apiUrl = aws_cdk_lib_1.Fn.join('', [this.api.restApiId, '.execute-api.', service.props.regionName, '.amazonaws.com']);
+        this.basePath = params.basePath || '/';
+        this.basePathResource = this.api.root.resourceForPath(this.basePath);
+        if (params.httpProxyIntegration?.httpProxyIntegrationUrl) {
+            const proxy = this.basePathResource.addProxy({ anyMethod: false });
+            proxy.addMethod('ANY', new awsApigateway.HttpIntegration(params.httpProxyIntegration.httpProxyIntegrationUrl, {
                 httpMethod: 'ANY',
                 proxy: true,
                 options: { requestParameters: { 'integration.request.path.proxy': 'method.request.path.proxy' } },
-            }), { requestParameters: { 'method.request.path.proxy': true }, apiKeyRequired: params.apiKeyRequired });
-            // I'm sorry for this, but there isn't a better way to do this...
-            this.api.methods
-                .filter((method) => method.httpMethod === 'OPTIONS')
-                .forEach((m) => {
-                proxy.node.tryRemoveChild(m.node.id);
-            });
+            }), { requestParameters: { 'method.request.path.proxy': true }, apiKeyRequired: params.httpProxyIntegration.apiKeyRequired });
             proxy.addCorsPreflight({
                 allowOrigins: ['*'],
                 allowHeaders: ['*'],
@@ -79,11 +84,29 @@ class ApiRestPrefab extends constructs_1.Construct {
                 statusCode: 204,
             });
         }
-        if (params.cdnApiPrefab)
-            params.cdnApiPrefab.addApiGateway(params.basePath, apiUrl, {
-                originPath: `/${this.api.deploymentStage.stageName}`,
-            });
-        new aws_cdk_lib_1.CfnOutput(this, 'RestApiUrl', { value: apiUrl });
+        // If CDN present, add it
+        params.cdnApiPrefab?.addApiGateway(this.basePath, this.apiUrl, { originPath: `/${this.api.deploymentStage.stageName}` });
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('RestApiUrl'), { value: this.apiUrl });
+    }
+    addPath(params) {
+        const { apiDefinition, apiFunctionsPrefab, lambdaFunction } = params;
+        if (!apiDefinition.isPublic && !this.authorizer) {
+            throw new Error('Missing Authorizer. Provide one, or change the API to be public (isPublic: true)');
+        }
+        if (this.basePath !== apiDefinition.basePath) {
+            throw new Error('basePath does not match with current ApiGateway basePath');
+        }
+        const basePath = apiDefinition.basePath === '/' ? '' : apiDefinition.basePath;
+        const resourcePath = apiDefinition.path === '/' ? '' : apiDefinition.path;
+        const path = `${basePath}${resourcePath}`;
+        const resource = new awsApigateway.Resource(apiFunctionsPrefab, this.getId(`${apiDefinition.method}-${path}`), {
+            parent: this.basePathResource,
+            pathPart: path,
+        });
+        // resource.addMethod(apiDefinition.method, new awsApigateway.LambdaIntegration(lambdaFunction), {
+        //   operationName: this.getId(`${apiDefinition.method}-${path}`),
+        //   ...(apiDefinition.isPublic ? {} : { authorizer: this.authorizer }),
+        // });
     }
 }
 exports.ApiRestPrefab = ApiRestPrefab;

package/prefab/gateway/api-gateway/api-rest.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-rest.js","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-rest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-rest.js","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-rest.ts"],"names":[],"mappings":"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"}

package/prefab/gateway/api-gateway/index.d.ts

@@ -1,3 +1,3 @@
 export * from './api-http';
 export * from './api-rest';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/gateway/index.d.ts

@@ -1,4 +1,3 @@
 export * from './alb-public';
 export * from './api-gateway';
-export * from './app-sync';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/gateway/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../prefab/gateway/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../prefab/gateway/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}

package/prefab/gateway/index.js

@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./alb-public"), exports);
 __exportStar(require("./api-gateway"), exports);
-__exportStar(require("./app-sync"), exports);
+// export * from './app-sync';
 //# sourceMappingURL=index.js.map

package/prefab/gateway/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../prefab/gateway/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,gDAA8B;AAC9B,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../prefab/gateway/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,gDAA8B;AAC9B,8BAA8B"}

package/prefab/index.d.ts

@@ -1,4 +1,3 @@
-export * from './analytics';
 export * from './auth';
 export * from './cdn';
 export * from './compute';
@@ -7,5 +6,6 @@ export * from './gateway';
 export * from './integration';
 export * from './networking';
 export * from './storage';
+export * from './secrets';
 export * from './utils';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../prefab/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../prefab/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/prefab/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./analytics"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./cdn"), exports);
 __exportStar(require("./compute"), exports);
@@ -23,5 +22,6 @@ __exportStar(require("./gateway"), exports);
 __exportStar(require("./integration"), exports);
 __exportStar(require("./networking"), exports);
 __exportStar(require("./storage"), exports);
+__exportStar(require("./secrets"), exports);
 __exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/prefab/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../prefab/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,yCAAuB;AACvB,wCAAsB;AACtB,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,gDAA8B;AAC9B,+CAA6B;AAC7B,4CAA0B;AAC1B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../prefab/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,wCAAsB;AACtB,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,gDAA8B;AAC9B,+CAA6B;AAC7B,4CAA0B;AAC1B,4CAA0B;AAC1B,0CAAwB"}

package/prefab/integration/event-bus/index.d.ts

@@ -1,20 +1,24 @@
-import { IEventBus } from 'aws-cdk-lib/aws-events';
-import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
-import { Construct } from 'constructs';
-
-import { ServiceStack, Modifier } from '../../../common';
-
+import { CronOptions, EventBusProps, EventPattern, IEventBus } from 'aws-cdk-lib/aws-events';
+import { IFunction } from 'aws-cdk-lib/aws-lambda';
+import { TakumiStack, Modifier, Prefab, PrefabPropsOverride, BaseCustomConfigs } from '../../../common';
 export type EventBusPrefabParams = {
-  defaultEventBus?: true;
+    name: string;
+    useDefaultEventBus?: boolean;
+    resourceProps?: {
+        eventBus: Partial<EventBusProps>;
+    };
+    existingResource?: {
+        eventBus?: IEventBus;
+    };
 };
-export declare class EventBusPrefab extends Construct {
-  readonly bus: IEventBus;
-  constructor(service: ServiceStack, params?: EventBusPrefabParams);
-  useMod(variableName: string | undefined, mods: ((bus: IEventBus) => any)[]): Modifier;
-  static modifier: {
-    writer: (bus: IEventBus) => Modifier;
-  };
-  useModWriter(variableName?: string): Modifier;
-  static addBus(lambdaFunction: NodejsFunction, eventBus?: IEventBus): void;
+export declare class EventBusPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<EventBusPrefabParams, CustomConfigs> {
+    readonly eventBus: IEventBus;
+    constructor(service: TakumiStack<CustomConfigs>, params: EventBusPrefabParams, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+    addRule(name: string, eventPattern: EventPattern, lambdaFunction: IFunction): void;
+    addCronRule(name: string, cronOptions: CronOptions, lambdaFunction: IFunction): void;
+    static mods: {
+        writer: (eventBusPrefab: EventBusPrefab) => Modifier;
+    };
+    applyMods<K extends keyof typeof EventBusPrefab.mods>(mods: K[], envVar?: string): Modifier;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/integration/event-bus/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/integration/event-bus/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAmC,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEjF,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,CAAC,EAAE,IAAI,CAAC;CACxB,CAAC;AACF,qBAAa,cAAe,SAAQ,SAAS;IAC3C,SAAgB,GAAG,EAAE,SAAS,CAAC;gBAEnB,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,oBAAoB;IAWzD,MAAM,CAAC,YAAY,oBAAc,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,GAAG,CAAC,EAAE,GAAG,QAAQ;IAQtF,OAAc,QAAQ;sBACN,SAAS,KAAG,QAAQ;MAKlC;IAGK,YAAY,CAAC,YAAY,SAAc,GAAG,QAAQ;WAK3C,MAAM,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,IAAI;CAMjF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/integration/event-bus/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAY,aAAa,EAAE,YAAY,EAAE,SAAS,EAAkB,MAAM,wBAAwB,CAAC;AAEvH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,iBAAiB,EAAkB,MAAM,iBAAiB,CAAC;AAExH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;KAClC,CAAC;IACF,gBAAgB,CAAC,EAAE;QACjB,QAAQ,CAAC,EAAE,SAAS,CAAC;KACtB,CAAC;CACH,CAAC;AACF,qBAAa,cAAc,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACrG,oBAAoB,EACpB,aAAa,CACd;IACC,SAAgB,QAAQ,EAAE,SAAS,CAAC;gBAGlC,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,oBAAoB,EAC5B,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAkB7C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS;IAQ3E,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS;IAQpF,OAAc,IAAI;iCACS,cAAc,KAAG,QAAQ;MAKlD;IAEK,SAAS,CAAC,CAAC,SAAS,MAAM,OAAO,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,SAAc,GAAG,QAAQ;CAMxG"}

package/prefab/integration/event-bus/index.js

@@ -2,44 +2,51 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventBusPrefab = void 0;
 const aws_events_1 = require("aws-cdk-lib/aws-events");
-const constructs_1 = require("constructs");
+const aws_events_targets_1 = require("aws-cdk-lib/aws-events-targets");
 const common_1 = require("../../../common");
-class EventBusPrefab extends constructs_1.Construct {
-    bus;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(EventBusPrefab.name));
-        if (params?.defaultEventBus) {
-            this.bus = aws_events_1.EventBus.fromEventBusName(service, 'DefaultEventBus', 'default');
-        }
-        else {
-            this.bus = new aws_events_1.EventBus(this, 'bus', { eventBusName: (0, common_1.getResourceName)('', service.props) });
+class EventBusPrefab extends common_1.Prefab {
+    eventBus;
+    constructor(service, params, propsOverride) {
+        super(EventBusPrefab.name, service, params, propsOverride);
+        if (params?.existingResource && params.useDefaultEventBus && params.existingResource.eventBus) {
+            throw new Error('Cannot specify both useDefaultEventBus and a custom bus at same time');
         }
+        this.eventBus =
+            params?.existingResource?.eventBus || params.useDefaultEventBus
+                ? aws_events_1.EventBus.fromEventBusName(this, this.getId('default'), 'default')
+                : new aws_events_1.EventBus(this, this.getId('bus'), {
+                    eventBusName: this.getResourceName('bus'),
+                    ...params?.resourceProps?.eventBus,
+                });
     }
     // Mods
-    useMod(variableName = 'EVENT_BUS', mods) {
-        return (lambda) => {
-            lambda.addEnvironment(variableName, this.bus.eventBusName);
-            mods.map((fn) => fn(this.bus)(lambda));
-        };
+    addRule(name, eventPattern, lambdaFunction) {
+        new aws_events_1.Rule(this, this.getId(`Rule-${(0, common_1.capFirstLetter)(name)}`), {
+            ruleName: this.getResourceName(`${name}-rule`),
+            eventBus: this.eventBus,
+            eventPattern: eventPattern,
+            targets: [new aws_events_targets_1.LambdaFunction(lambdaFunction)],
+        });
+    }
+    addCronRule(name, cronOptions, lambdaFunction) {
+        new aws_events_1.Rule(this, this.getId(`Rule-${(0, common_1.capFirstLetter)(name)}`), {
+            ruleName: this.getResourceName(`${name}-cron-rule`),
+            schedule: aws_events_1.Schedule.cron(cronOptions),
+            targets: [new aws_events_targets_1.LambdaFunction(lambdaFunction)],
+        });
     }
-    // Class Mods
-    static modifier = {
-        writer: (bus) => {
+    static mods = {
+        writer: (eventBusPrefab) => {
             return (lambda) => {
-                bus.grantPutEventsTo(lambda);
+                eventBusPrefab.eventBus.grantPutEventsTo(lambda);
             };
         },
     };
-    // Instance Mods
-    useModWriter(variableName = 'EVENT_BUS') {
-        return this.useMod(variableName, [EventBusPrefab.modifier.writer]);
-    }
-    // addBus is used inside aggregates in order to apply permissions if EventBus is there.
-    static addBus(lambdaFunction, eventBus) {
-        if (eventBus instanceof aws_events_1.EventBus) {
-            eventBus.grantPutEventsTo(lambdaFunction);
-            lambdaFunction.addEnvironment('EVENT_BUS', eventBus.eventBusName);
-        }
+    applyMods(mods, envVar = 'EVENT_BUS') {
+        return (lambda) => {
+            lambda.addEnvironment(envVar, this.eventBus.eventBusName);
+            mods.map((key) => EventBusPrefab.mods[key](this)(lambda));
+        };
     }
 }
 exports.EventBusPrefab = EventBusPrefab;

package/prefab/integration/event-bus/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/integration/event-bus/index.ts"],"names":[],"mappings":";;;AAAA,uDAA6D;AAE7D,2CAAuC;AAEvC,mCAAiF;AAKjF,MAAa,cAAe,SAAQ,sBAAS;IAC3B,GAAG,CAAY;IAE/B,YAAY,OAAqB,EAAE,MAA6B;QAC9D,KAAK,CAAC,OAAO,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpD,IAAI,MAAM,EAAE,eAAe,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,GAAG,qBAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,GAAG,IAAI,qBAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,IAAA,wBAAe,EAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,OAAO;IACA,MAAM,CAAC,YAAY,GAAG,WAAW,EAAE,IAAiC;QACzE,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;IACN,MAAM,CAAC,QAAQ,GAAG;QACvB,MAAM,EAAE,CAAC,GAAc,EAAY,EAAE;YACnC,OAAO,CAAC,MAAM,EAAE,EAAE;gBAChB,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC/B,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;IAEF,gBAAgB;IACT,YAAY,CAAC,YAAY,GAAG,WAAW;QAC5C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,uFAAuF;IAChF,MAAM,CAAC,MAAM,CAAC,cAA8B,EAAE,QAAoB;QACvE,IAAI,QAAQ,YAAY,qBAAQ,EAAE,CAAC;YACjC,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC1C,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;;AAzCH,wCA0CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/integration/event-bus/index.ts"],"names":[],"mappings":";;;AAAA,uDAAuH;AACvH,uEAAgE;AAGhE,4CAAwH;AAYxH,MAAa,cAA4E,SAAQ,eAGhG;IACiB,QAAQ,CAAY;IAEpC,YACE,OAAmC,EACnC,MAA4B,EAC5B,aAAkD;QAElD,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3D,IAAI,MAAM,EAAE,gBAAgB,IAAI,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YAC9F,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,CAAC,QAAQ;YACX,MAAM,EAAE,gBAAgB,EAAE,QAAQ,IAAI,MAAM,CAAC,kBAAkB;gBAC7D,CAAC,CAAC,qBAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;gBACnE,CAAC,CAAC,IAAI,qBAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBACpC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;oBACzC,GAAG,MAAM,EAAE,aAAa,EAAE,QAAQ;iBACnC,CAAC,CAAC;IACX,CAAC;IAED,OAAO;IACA,OAAO,CAAC,IAAY,EAAE,YAA0B,EAAE,cAAyB;QAChF,IAAI,iBAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACzD,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,OAAO,CAAC;YAC9C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,CAAC,IAAI,mCAAc,CAAC,cAAc,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IACM,WAAW,CAAC,IAAY,EAAE,WAAwB,EAAE,cAAyB;QAClF,IAAI,iBAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACzD,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,YAAY,CAAC;YACnD,QAAQ,EAAE,qBAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;YACpC,OAAO,EAAE,CAAC,IAAI,mCAAc,CAAC,cAAc,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,IAAI,GAAG;QACnB,MAAM,EAAE,CAAC,cAA8B,EAAY,EAAE;YACnD,OAAO,CAAC,MAAM,EAAE,EAAE;gBAChB,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACnD,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;IAEK,SAAS,CAA6C,IAAS,EAAE,MAAM,GAAG,WAAW;QAC1F,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAyC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACjG,CAAC,CAAC;IACJ,CAAC;;AAxDH,wCAyDC"}

package/prefab/integration/index.d.ts

@@ -1,4 +1,4 @@
 export * from './event-bus';
 export * from './queue';
 export * from './topic';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/integration/queue/index.d.ts

@@ -1,29 +1,37 @@
 import { Duration } from 'aws-cdk-lib';
+import { Rule, RuleProps } from 'aws-cdk-lib/aws-events';
 import { Queue, QueueProps } from 'aws-cdk-lib/aws-sqs';
-import { Construct } from 'constructs';
-import { EventConfig } from '@takumi-stack/sdk';
-import { Modifier, ServiceStack } from '../../../common';
+import { EventDefinition } from '@takumi-stack/sdk';
+import { BaseCustomConfigs, Modifier, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
 import { EventBusPrefab } from '../event-bus';
-export type FifoProperties = Pick<QueueProps, 'contentBasedDeduplication' | 'deduplicationScope' | 'fifoThroughputLimit'>;
 export type QueuePrefabParams = {
     name: string;
+    fifo?: boolean;
     maxRetries?: number;
-    dlqRetention?: Duration;
-    visibilityTimeout?: Duration;
-    deliveryDelay?: Duration;
-    dlq?: Queue;
-    fifo?: FifoProperties;
-    eventBus?: EventBusPrefab;
-    eventConfig?: EventConfig[];
+    fromEventBusConfig?: {
+        eventBusPrefab: EventBusPrefab;
+        eventConfig: EventDefinition[];
+    };
+    resourceProps?: {
+        queueProps?: Partial<QueueProps>;
+        dqlProps?: Partial<QueueProps>;
+        ruleProps?: Partial<RuleProps>;
+    };
+    useExistingResource?: {
+        queue?: Queue;
+        dlq?: Queue;
+        rule?: Rule;
+    };
 };
-export declare class QueuePrefab extends Construct {
-    readonly dlq: Queue;
+export declare class QueuePrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<QueuePrefabParams, CustomConfigs> {
     readonly queue: Queue;
-    constructor(service: ServiceStack, params: QueuePrefabParams);
-    useMod(variableName: string | undefined, mods: ((queue: Queue) => any)[]): Modifier;
-    static modifier: {
-        writer: (queue: Queue) => Modifier;
+    readonly visibilityTimeout: Duration;
+    readonly dlq: Queue;
+    readonly rule?: Rule;
+    constructor(service: TakumiStack<CustomConfigs>, params: QueuePrefabParams, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+    static mods: {
+        writer: (queuePrefab: QueuePrefab) => Modifier;
     };
-    useModWriter(variableName?: string): Modifier;
+    applyMods<K extends keyof typeof QueuePrefab.mods>(mods: K[], envVar?: string): Modifier;
 }
 //# sourceMappingURL=index.d.ts.map

package/prefab/integration/queue/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/integration/queue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAyD,QAAQ,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEvG,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,2BAA2B,GAAG,oBAAoB,GAAG,qBAAqB,CAAC,CAAC;AAE1H,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAC7B,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B,CAAC;AAEF,qBAAa,WAAY,SAAQ,SAAS;IACxC,SAAgB,GAAG,EAAE,KAAK,CAAC;IAC3B,SAAgB,KAAK,EAAE,KAAK,CAAC;gBAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB;IA2CrD,MAAM,CAAC,YAAY,oBAAe,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAC,EAAE,GAAG,QAAQ;IAQrF,OAAc,QAAQ;wBACJ,KAAK,KAAG,QAAQ;MAKhC;IAGK,YAAY,CAAC,YAAY,SAAe,GAAG,QAAQ;CAG3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/integration/queue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,WAAW,EAAE,eAAe,EAAE,CAAC;KAChC,CAAC;IACF,aAAa,CAAC,EAAE;QACd,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACjC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/B,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;KAChC,CAAC;IACF,mBAAmB,CAAC,EAAE;QACpB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,GAAG,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,CAAC,EAAE,IAAI,CAAC;KACb,CAAC;CACH,CAAC;AAEF,qBAAa,WAAW,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CAClG,iBAAiB,EACjB,aAAa,CACd;IACC,SAAgB,KAAK,EAAE,KAAK,CAAC;IAC7B,SAAgB,iBAAiB,EAAE,QAAQ,CAAC;IAC5C,SAAgB,GAAG,EAAE,KAAK,CAAC;IAC3B,SAAgB,IAAI,CAAC,EAAE,IAAI,CAAC;gBAG1B,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,iBAAiB,EACzB,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAoDpD,OAAc,IAAI;8BACM,WAAW,KAAG,QAAQ;MAK5C;IAEK,SAAS,CAAC,CAAC,SAAS,MAAM,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,SAAU,GAAG,QAAQ;CAMjG"}