@aws-amplify/cli-internal-gen2-migration-experimental-alpha 0.6.0 → 0.7.0

package/lib/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.js

@@ -1,141 +1,119 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_assert_1 = __importDefault(require("node:assert"));
-const REF = 'Ref';
-const GET_ATT = 'Fn::GetAtt';
-class CfnOutputResolver {
-    constructor(template, region, accountId) {
-        this.template = template;
-        this.region = region;
-        this.accountId = accountId;
-    }
-    resolve(logicalResourceIds, stackOutputs, stackResources) {
-        var _a, _b, _c;
-        const resources = (_a = this.template) === null || _a === void 0 ? void 0 : _a.Resources;
-        (0, node_assert_1.default)(resources);
-        const clonedStackTemplate = JSON.parse(JSON.stringify(this.template));
-        const stackTemplateOutputs = (_b = this.template) === null || _b === void 0 ? void 0 : _b.Outputs;
-        const stackTemplateResources = (_c = this.template) === null || _c === void 0 ? void 0 : _c.Resources;
-        (0, node_assert_1.default)(stackTemplateResources);
-        (0, node_assert_1.default)(stackOutputs);
-        (0, node_assert_1.default)(stackTemplateOutputs);
-        let stackTemplateResourcesString = JSON.stringify(stackTemplateResources);
-        Object.entries(stackTemplateOutputs).forEach(([outputKey, outputValue]) => {
-            var _a, _b;
-            const value = outputValue.Value;
-            const stackOutputValue = (_a = stackOutputs === null || stackOutputs === void 0 ? void 0 : stackOutputs.find((op) => op.OutputKey === outputKey)) === null || _a === void 0 ? void 0 : _a.OutputValue;
-            (0, node_assert_1.default)(stackOutputValue);
-            if (typeof value !== 'object') {
-                return;
-            }
-            let logicalResourceId;
-            if (REF in value && typeof value[REF] === 'string') {
-                logicalResourceId = value[REF];
-                const outputRegexp = new RegExp(`{"${REF}":"${logicalResourceId}"}`, 'g');
-                stackTemplateResourcesString = stackTemplateResourcesString.replaceAll(outputRegexp, `"${stackOutputValue}"`);
-            }
-            else if (GET_ATT in value && Array.isArray(value[GET_ATT])) {
-                logicalResourceId = value[GET_ATT][0];
-            }
-            else {
-                return;
-            }
-            (0, node_assert_1.default)(logicalResourceId);
-            const fnGetAttRegExp = new RegExp(`{"${GET_ATT}":\\["${logicalResourceId}","(?<AttributeName>\\w+)"]}`, 'g');
-            const fnGetAttRegExpResult = stackTemplateResourcesString.matchAll(fnGetAttRegExp).next();
-            if (!fnGetAttRegExpResult.done) {
-                const resourceType = this.template.Resources[logicalResourceId].Type;
-                const attributeName = (_b = fnGetAttRegExpResult.value.groups) === null || _b === void 0 ? void 0 : _b.AttributeName;
-                (0, node_assert_1.default)(attributeName);
-                const resource = this.getResourceAttribute(attributeName, resourceType, stackOutputValue);
-                if (resource) {
-                    stackTemplateResourcesString = stackTemplateResourcesString.replaceAll(fnGetAttRegExp, this.buildFnGetAttReplace(resource));
-                }
-            }
-        });
-        stackTemplateResourcesString = this.tryReplaceLogicalResourceRefWithPhysicalId(stackTemplateResourcesString, stackResources);
-        clonedStackTemplate.Resources = JSON.parse(stackTemplateResourcesString);
-        Object.entries(clonedStackTemplate.Outputs).forEach(([outputKey]) => {
-            var _a;
-            const stackOutputValue = (_a = stackOutputs === null || stackOutputs === void 0 ? void 0 : stackOutputs.find((op) => op.OutputKey === outputKey)) === null || _a === void 0 ? void 0 : _a.OutputValue;
-            (0, node_assert_1.default)(stackOutputValue);
-            clonedStackTemplate.Outputs[outputKey].Value = stackOutputValue;
+exports.resolveOutputs = resolveOutputs;
+const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+const cfn_tree_walker_1 = require("./cfn-tree-walker");
+function resolveOutputs(params) {
+    var _a;
+    const { template, stackOutputs, stackResources, region, accountId } = params;
+    const cloned = JSON.parse(JSON.stringify(template));
+    const templateOutputs = (_a = cloned.Outputs) !== null && _a !== void 0 ? _a : {};
+    const templateResources = cloned.Resources;
+    if (!templateResources) {
+        throw new amplify_cli_core_1.AmplifyError('InvalidStackError', {
+            message: 'Template is missing Resources section',
         });
-        return clonedStackTemplate;
     }
-    tryReplaceLogicalResourceRefWithPhysicalId(stackTemplateResourcesString, stackResources) {
-        const fnGetAttRegExp = new RegExp(`{"${GET_ATT}":\\["(?<LogicalResourceId>\\w+)","(?<AttributeName>\\w+)"]}`, 'g');
-        const fnGetAttRegExpResult = stackTemplateResourcesString.matchAll(fnGetAttRegExp);
-        for (const fnGetAttRegExpResultItem of fnGetAttRegExpResult) {
-            const groups = fnGetAttRegExpResultItem.groups;
-            if (groups && groups.LogicalResourceId) {
-                const stackResourceWithMatchingLogicalId = stackResources.find((resource) => resource.LogicalResourceId === groups.LogicalResourceId);
-                if (stackResourceWithMatchingLogicalId) {
-                    const fnGetAttRegExpPerLogicalId = new RegExp(`{"${GET_ATT}":\\["${groups.LogicalResourceId}","(?<AttributeName>\\w+)"]}`, 'g');
-                    const stackResourcePhysicalId = stackResourceWithMatchingLogicalId.PhysicalResourceId;
-                    (0, node_assert_1.default)(stackResourcePhysicalId);
-                    if (groups.AttributeName === 'Arn') {
-                        const resourceId = stackResourcePhysicalId.startsWith('http') ? stackResourcePhysicalId.split('/')[2] : stackResourcePhysicalId;
-                        const resourceArn = this.getResourceAttribute(groups.AttributeName, stackResourceWithMatchingLogicalId.ResourceType, resourceId);
-                        if (resourceArn) {
-                            stackTemplateResourcesString = stackTemplateResourcesString.replaceAll(fnGetAttRegExpPerLogicalId, `"${resourceArn.Arn}"`);
-                        }
-                        else {
-                            stackTemplateResourcesString = stackTemplateResourcesString.replaceAll(fnGetAttRegExpPerLogicalId, `"${stackResourcePhysicalId}"`);
-                        }
-                    }
-                    else {
-                        stackTemplateResourcesString = stackTemplateResourcesString.replaceAll(fnGetAttRegExpPerLogicalId, `"${stackResourcePhysicalId}"`);
+    const { refLookup, getAttLookup } = buildOutputLookup(templateOutputs, stackOutputs);
+    cloned.Resources = (0, cfn_tree_walker_1.walkCfnTree)(templateResources, (node) => {
+        var _a;
+        if ('Ref' in node && typeof node.Ref === 'string' && Object.keys(node).length === 1) {
+            const value = refLookup.get(node.Ref);
+            if (value !== undefined)
+                return value;
+        }
+        if ('Fn::GetAtt' in node && Array.isArray(node['Fn::GetAtt']) && Object.keys(node).length === 1) {
+            const [logicalId, attrName] = node['Fn::GetAtt'];
+            if (typeof logicalId === 'string' && typeof attrName === 'string') {
+                const outputValue = getAttLookup.get(logicalId);
+                if (outputValue !== undefined && attrName === 'Arn') {
+                    const resourceType = (_a = templateResources[logicalId]) === null || _a === void 0 ? void 0 : _a.Type;
+                    if (resourceType) {
+                        const arn = buildArn(resourceType, outputValue, region, accountId);
+                        if (arn)
+                            return arn;
                     }
                 }
             }
         }
-        return stackTemplateResourcesString;
-    }
-    getResourceAttribute(attributeName, resourceType, resourceIdentifier) {
-        switch (attributeName) {
-            case 'Arn': {
-                switch (resourceType) {
-                    case 'AWS::S3::Bucket':
-                        return {
-                            Arn: `arn:aws:s3:::${resourceIdentifier}`,
-                        };
-                    case 'AWS::DynamoDB::Table':
-                        return {
-                            Arn: `arn:aws:dynamodb:${this.region}:${this.accountId}:table/${resourceIdentifier}`,
-                        };
-                    case 'AWS::Cognito::UserPool':
-                        return {
-                            Arn: `arn:aws:cognito-idp:${this.region}:${this.accountId}:userpool/${resourceIdentifier}`,
-                        };
-                    case 'AWS::IAM::Role':
-                        return {
-                            Arn: resourceIdentifier.startsWith('arn:aws:iam')
-                                ? resourceIdentifier
-                                : `arn:aws:iam::${this.accountId}:role/${resourceIdentifier}`,
-                        };
-                    case 'AWS::SQS::Queue':
-                        return {
-                            Arn: `arn:aws:sqs:${this.region}:${this.accountId}:${resourceIdentifier}`,
-                        };
-                    case 'AWS::Lambda::Function':
-                        return {
-                            Arn: `arn:aws:lambda:${this.region}:${this.accountId}:function:${resourceIdentifier}`,
-                        };
-                    default:
-                        return undefined;
-                }
-            }
-            default:
+        return undefined;
+    });
+    cloned.Resources = (0, cfn_tree_walker_1.walkCfnTree)(cloned.Resources, (node) => {
+        var _a;
+        if ('Fn::GetAtt' in node && Array.isArray(node['Fn::GetAtt']) && Object.keys(node).length === 1) {
+            const [logicalId, attrName] = node['Fn::GetAtt'];
+            if (typeof logicalId !== 'string' || typeof attrName !== 'string')
+                return undefined;
+            const stackResource = stackResources.find((r) => r.LogicalResourceId === logicalId);
+            if (!(stackResource === null || stackResource === void 0 ? void 0 : stackResource.PhysicalResourceId))
                 return undefined;
+            const physicalId = stackResource.PhysicalResourceId;
+            const resourceType = (_a = stackResource.ResourceType) !== null && _a !== void 0 ? _a : '';
+            if (resourceType === 'AWS::Kinesis::Stream' && attrName === 'Arn' && !physicalId.startsWith('arn:aws:kinesis')) {
+                throw new amplify_cli_core_1.AmplifyError('InvalidStackError', {
+                    message: `Kinesis stream ARN must be exposed in CloudFormation outputs. ` +
+                        `Found physical resource ID '${physicalId}' for logical resource '${logicalId}' which is not a valid ARN. ` +
+                        `Please add an output with Fn::GetAtt for the Kinesis stream's Arn attribute.`,
+                });
+            }
+            if (attrName === 'Arn') {
+                const resourceId = physicalId.startsWith('http') ? physicalId.split('/').pop() : physicalId;
+                const arn = buildArn(resourceType, resourceId, region, accountId);
+                return arn !== null && arn !== void 0 ? arn : physicalId;
+            }
+            return physicalId;
+        }
+        return undefined;
+    });
+    for (const [outputKey, outputDef] of Object.entries(templateOutputs)) {
+        const runtimeOutput = stackOutputs.find((o) => o.OutputKey === outputKey);
+        if (!(runtimeOutput === null || runtimeOutput === void 0 ? void 0 : runtimeOutput.OutputValue)) {
+            throw new amplify_cli_core_1.AmplifyError('InvalidStackError', {
+                message: `Stack output '${outputKey}' has no runtime value`,
+            });
         }
+        outputDef.Value = runtimeOutput.OutputValue;
     }
-    buildFnGetAttReplace(record) {
-        return (_match, _p1, _offset, _text, groups) => `"${record[groups.AttributeName]}"`;
+    return cloned;
+}
+function buildOutputLookup(templateOutputs, stackOutputs) {
+    const refLookup = new Map();
+    const getAttLookup = new Map();
+    for (const [outputKey, outputDef] of Object.entries(templateOutputs)) {
+        const value = outputDef.Value;
+        if (typeof value !== 'object' || value === null)
+            continue;
+        const runtimeOutput = stackOutputs.find((o) => o.OutputKey === outputKey);
+        if (!(runtimeOutput === null || runtimeOutput === void 0 ? void 0 : runtimeOutput.OutputValue))
+            continue;
+        const record = value;
+        if ('Ref' in record && typeof record.Ref === 'string') {
+            refLookup.set(record.Ref, runtimeOutput.OutputValue);
+        }
+        else if ('Fn::GetAtt' in record && Array.isArray(record['Fn::GetAtt'])) {
+            getAttLookup.set(record['Fn::GetAtt'][0], runtimeOutput.OutputValue);
+        }
+    }
+    return { refLookup, getAttLookup };
+}
+function buildArn(resourceType, resourceId, region, accountId) {
+    switch (resourceType) {
+        case 'AWS::S3::Bucket':
+            return `arn:aws:s3:::${resourceId}`;
+        case 'AWS::DynamoDB::Table':
+            return `arn:aws:dynamodb:${region}:${accountId}:table/${resourceId}`;
+        case 'AWS::Cognito::UserPool':
+            return `arn:aws:cognito-idp:${region}:${accountId}:userpool/${resourceId}`;
+        case 'AWS::IAM::Role':
+            return resourceId.startsWith('arn:aws:iam') ? resourceId : `arn:aws:iam::${accountId}:role/${resourceId}`;
+        case 'AWS::SQS::Queue':
+            return `arn:aws:sqs:${region}:${accountId}:${resourceId}`;
+        case 'AWS::Lambda::Function':
+            return `arn:aws:lambda:${region}:${accountId}:function:${resourceId}`;
+        case 'AWS::Kinesis::Stream':
+            return resourceId;
+        default:
+            return undefined;
     }
 }
-exports.default = CfnOutputResolver;
 //# sourceMappingURL=cfn-output-resolver.js.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-output-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cfn-output-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts"],"names":[],"mappings":"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"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.d.ts

@@ -1,10 +1,4 @@
-import { CFNTemplate } from '../types';
 import { Parameter } from '@aws-sdk/client-cloudformation';
-declare class CfnParameterResolver {
-    private readonly template;
-    private readonly stackName;
-    constructor(template: CFNTemplate, stackName?: string | undefined);
-    resolve(parameters: Parameter[]): any;
-}
-export default CfnParameterResolver;
+import { CFNTemplate } from '../../_infra/cfn-template';
+export declare function resolveParameters(template: CFNTemplate, parameters: Parameter[], stackName?: string): CFNTemplate;
 //# sourceMappingURL=cfn-parameter-resolver.d.ts.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-parameter-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAgB,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAG3D,cAAM,oBAAoB;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAe,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAjD,QAAQ,EAAE,WAAW,EAAmB,SAAS,GAAE,MAAM,GAAG,SAAqB;IAEvG,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE;CAmCvC;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"cfn-parameter-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAE,WAAW,EAA6B,MAAM,2BAA2B,CAAC;AAanF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW,CAwCjH"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.js

@@ -1,49 +1,44 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../types");
-const node_assert_1 = __importDefault(require("node:assert"));
-class CfnParameterResolver {
-    constructor(template, stackName = undefined) {
-        this.template = template;
-        this.stackName = stackName;
+exports.resolveParameters = resolveParameters;
+const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+const cfn_template_1 = require("../../_infra/cfn-template");
+const cfn_tree_walker_1 = require("./cfn-tree-walker");
+function resolveParameters(template, parameters, stackName) {
+    var _a;
+    if (!parameters.length && !stackName)
+        return template;
+    const templateParams = (_a = template.Parameters) !== null && _a !== void 0 ? _a : {};
+    const paramMap = new Map();
+    if (stackName) {
+        paramMap.set(cfn_template_1.CFN_PSEUDO_PARAMETERS_REF.StackName, stackName);
     }
-    resolve(parameters) {
-        if (!parameters.length)
-            return this.template;
-        const clonedParameters = JSON.parse(JSON.stringify(parameters));
-        const clonedGen1Template = JSON.parse(JSON.stringify(this.template));
-        let templateString = JSON.stringify(clonedGen1Template);
-        const parametersFromTemplate = this.template.Parameters;
-        const clonedParametersFromTemplate = JSON.parse(JSON.stringify(parametersFromTemplate));
-        if (this.stackName) {
-            clonedParametersFromTemplate[types_1.CFN_PSEUDO_PARAMETERS_REF.StackName] = {
-                Type: 'String',
-            };
-            clonedParameters.push({
-                ParameterKey: types_1.CFN_PSEUDO_PARAMETERS_REF.StackName,
-                ParameterValue: this.stackName,
+    for (const { ParameterKey, ParameterValue } of parameters) {
+        if (!ParameterKey) {
+            throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+                message: 'Encountered a stack parameter with no ParameterKey',
             });
         }
-        for (const { ParameterKey, ParameterValue } of clonedParameters) {
-            (0, node_assert_1.default)(ParameterKey);
-            if (!ParameterValue)
-                continue;
-            const { Type: parameterType, NoEcho } = clonedParametersFromTemplate[ParameterKey];
-            if (NoEcho)
-                continue;
-            let resolvedParameterValue = JSON.stringify(ParameterValue);
-            const isListValue = parameterType === 'CommaDelimitedList' || parameterType === 'List<Number>';
-            if (isListValue) {
-                resolvedParameterValue = JSON.stringify(ParameterValue.includes(',') ? ParameterValue.split(',') : [ParameterValue]);
-            }
-            const paramRegexp = new RegExp(`{"Ref":"${ParameterKey}"}`, 'g');
-            templateString = templateString.replaceAll(paramRegexp, resolvedParameterValue);
-        }
-        return JSON.parse(templateString);
+        if (!ParameterValue)
+            continue;
+        const paramDef = templateParams[ParameterKey];
+        if (!paramDef)
+            continue;
+        if (paramDef.NoEcho)
+            continue;
+        const isListType = paramDef.Type === 'CommaDelimitedList' || paramDef.Type === 'List<Number>';
+        const resolved = isListType ? (ParameterValue.includes(',') ? ParameterValue.split(',') : [ParameterValue]) : ParameterValue;
+        paramMap.set(ParameterKey, resolved);
     }
+    if (paramMap.size === 0)
+        return template;
+    return (0, cfn_tree_walker_1.walkCfnTree)(template, (node) => {
+        if ('Ref' in node && typeof node.Ref === 'string' && Object.keys(node).length === 1) {
+            const value = paramMap.get(node.Ref);
+            if (value !== undefined)
+                return value;
+        }
+        return undefined;
+    });
 }
-exports.default = CfnParameterResolver;
 //# sourceMappingURL=cfn-parameter-resolver.js.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-parameter-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.ts"],"names":[],"mappings":";;;;;AAAA,oCAAgF;AAEhF,8DAAiC;AAEjC,MAAM,oBAAoB;IACxB,YAA6B,QAAqB,EAAmB,YAAgC,SAAS;QAAjF,aAAQ,GAAR,QAAQ,CAAa;QAAmB,cAAS,GAAT,SAAS,CAAgC;IAAG,CAAC;IAE3G,OAAO,CAAC,UAAuB;QACpC,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;QAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAgB,CAAC;QAC/E,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAgB,CAAC;QACpF,IAAI,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACxD,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QACxD,MAAM,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAiC,CAAC;QAGxH,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,4BAA4B,CAAC,iCAAyB,CAAC,SAAS,CAAC,GAAG;gBAClE,IAAI,EAAE,QAAQ;aACf,CAAC;YACF,gBAAgB,CAAC,IAAI,CAAC;gBACpB,YAAY,EAAE,iCAAyB,CAAC,SAAS;gBACjD,cAAc,EAAE,IAAI,CAAC,SAAS;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAChE,IAAA,qBAAM,EAAC,YAAY,CAAC,CAAC;YACrB,IAAI,CAAC,cAAc;gBAAE,SAAS;YAC9B,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;YACnF,IAAI,MAAM;gBAAE,SAAS;YAGrB,IAAI,sBAAsB,GAAW,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,aAAa,KAAK,oBAAoB,IAAI,aAAa,KAAK,cAAc,CAAC;YAC/F,IAAI,WAAW,EAAE,CAAC;gBAChB,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACvH,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,WAAW,YAAY,IAAI,EAAE,GAAG,CAAC,CAAC;YACjE,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;CACF;AAED,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"cfn-parameter-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-parameter-resolver.ts"],"names":[],"mappings":";;AAeA,8CAwCC;AAtDD,oEAA6D;AAC7D,4DAAmF;AACnF,uDAAgD;AAYhD,SAAgB,iBAAiB,CAAC,QAAqB,EAAE,UAAuB,EAAE,SAAkB;;IAClG,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,SAAS;QAAE,OAAO,QAAQ,CAAC;IAEtD,MAAM,cAAc,GAAG,MAAA,QAAQ,CAAC,UAAU,mCAAI,EAAE,CAAC;IAIjD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IAE5C,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,CAAC,GAAG,CAAC,wCAAyB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,UAAU,EAAE,CAAC;QAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,+BAAY,CAAC,+BAA+B,EAAE;gBACtD,OAAO,EAAE,oDAAoD;aAC9D,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,cAAc;YAAE,SAAS;QAE9B,MAAM,QAAQ,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,IAAI,QAAQ,CAAC,MAAM;YAAE,SAAS;QAE9B,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,KAAK,oBAAoB,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC;QAC9F,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;QAE7H,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAEzC,OAAO,IAAA,6BAAW,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QACpC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpF,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,KAAK,CAAC;QACxC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAgB,CAAC;AACpB,CAAC"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.d.ts

@@ -0,0 +1,3 @@
+export type CfnTreeVisitor = (node: Readonly<Record<string, unknown>>) => unknown | undefined;
+export declare function walkCfnTree(node: unknown, visitor: CfnTreeVisitor): unknown;
+//# sourceMappingURL=cfn-tree-walker.d.ts.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cfn-tree-walker.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,OAAO,GAAG,SAAS,CAAC;AAK9F,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAa3E"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.walkCfnTree = walkCfnTree;
+function walkCfnTree(node, visitor) {
+    if (Array.isArray(node)) {
+        return node.map((item) => walkCfnTree(item, visitor));
+    }
+    if (node === null || typeof node !== 'object') {
+        return node;
+    }
+    const record = node;
+    const replacement = visitor(record);
+    if (replacement !== undefined) {
+        return replacement;
+    }
+    return Object.fromEntries(Object.entries(record).map(([key, value]) => [key, walkCfnTree(value, visitor)]));
+}
+//# sourceMappingURL=cfn-tree-walker.js.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cfn-tree-walker.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-tree-walker.ts"],"names":[],"mappings":";;AAmBA,kCAaC;AAbD,SAAgB,WAAW,CAAC,IAAa,EAAE,OAAuB;IAChE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,IAA+B,CAAC;IAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9G,CAAC"}

package/lib/commands/gen2-migration/refactor/stack-facade.d.ts

@@ -0,0 +1,13 @@
+import { Stack, StackResource } from '@aws-sdk/client-cloudformation';
+import { AwsClients } from '../_infra/aws-clients';
+import { CFNTemplate } from '../_infra/cfn-template';
+export declare class StackFacade {
+    private readonly clients;
+    readonly rootStackName: string;
+    constructor(clients: AwsClients, rootStackName: string);
+    fetchNestedStacks(): Promise<StackResource[]>;
+    fetchTemplate(stackId: string): Promise<CFNTemplate>;
+    fetchStack(stackId: string): Promise<Stack>;
+    fetchStackResources(stackId: string): Promise<StackResource[]>;
+}
+//# sourceMappingURL=stack-facade.d.ts.map

package/lib/commands/gen2-migration/refactor/stack-facade.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stack-facade.d.ts","sourceRoot":"","sources":["../../../../src/commands/gen2-migration/refactor/stack-facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,EACL,aAAa,EACd,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMrD,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,OAAO;aAA8B,aAAa,EAAE,MAAM;gBAA1D,OAAO,EAAE,UAAU,EAAkB,aAAa,EAAE,MAAM;IAK1E,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAQ7C,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAWpD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAY3C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAI5E"}

package/lib/commands/gen2-migration/refactor/stack-facade.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StackFacade = void 0;
+const client_cloudformation_1 = require("@aws-sdk/client-cloudformation");
+const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+class StackFacade {
+    constructor(clients, rootStackName) {
+        this.clients = clients;
+        this.rootStackName = rootStackName;
+    }
+    async fetchNestedStacks() {
+        var _a;
+        const response = await this.clients.cloudFormation.send(new client_cloudformation_1.DescribeStackResourcesCommand({ StackName: this.rootStackName }));
+        return ((_a = response.StackResources) !== null && _a !== void 0 ? _a : []).filter((r) => r.ResourceType === 'AWS::CloudFormation::Stack');
+    }
+    async fetchTemplate(stackId) {
+        const response = await this.clients.cloudFormation.send(new client_cloudformation_1.GetTemplateCommand({ StackName: stackId, TemplateStage: 'Original' }));
+        if (!response.TemplateBody) {
+            throw new amplify_cli_core_1.AmplifyError('InvalidStackError', { message: `Stack '${stackId}' returned an empty template` });
+        }
+        return JSON.parse(response.TemplateBody);
+    }
+    async fetchStack(stackId) {
+        var _a;
+        const response = await this.clients.cloudFormation.send(new client_cloudformation_1.DescribeStacksCommand({ StackName: stackId }));
+        const stack = (_a = response.Stacks) === null || _a === void 0 ? void 0 : _a[0];
+        if (!stack) {
+            throw new amplify_cli_core_1.AmplifyError('StackNotFoundError', { message: `Stack '${stackId}' not found` });
+        }
+        return stack;
+    }
+    async fetchStackResources(stackId) {
+        var _a;
+        const response = await this.clients.cloudFormation.send(new client_cloudformation_1.DescribeStackResourcesCommand({ StackName: stackId }));
+        return (_a = response.StackResources) !== null && _a !== void 0 ? _a : [];
+    }
+}
+exports.StackFacade = StackFacade;
+//# sourceMappingURL=stack-facade.js.map

package/lib/commands/gen2-migration/refactor/stack-facade.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stack-facade.js","sourceRoot":"","sources":["../../../../src/commands/gen2-migration/refactor/stack-facade.ts"],"names":[],"mappings":";;;AAAA,0EAMwC;AACxC,oEAA6D;AAQ7D,MAAa,WAAW;IACtB,YAA6B,OAAmB,EAAkB,aAAqB;QAA1D,YAAO,GAAP,OAAO,CAAY;QAAkB,kBAAa,GAAb,aAAa,CAAQ;IAAG,CAAC;IAKpF,KAAK,CAAC,iBAAiB;;QAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,qDAA6B,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC9H,OAAO,CAAC,MAAA,QAAQ,CAAC,cAAc,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,4BAA4B,CAAC,CAAC;IACxG,CAAC;IAKM,KAAK,CAAC,aAAa,CAAC,OAAe;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,0CAAkB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QACnI,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC3B,MAAM,IAAI,+BAAY,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,UAAU,OAAO,8BAA8B,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAgB,CAAC;IAC1D,CAAC;IAKM,KAAK,CAAC,UAAU,CAAC,OAAe;;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,6CAAqB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC3G,MAAM,KAAK,GAAG,MAAA,QAAQ,CAAC,MAAM,0CAAG,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,+BAAY,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,UAAU,OAAO,aAAa,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAKM,KAAK,CAAC,mBAAmB,CAAC,OAAe;;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,qDAA6B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnH,OAAO,MAAA,QAAQ,CAAC,cAAc,mCAAI,EAAE,CAAC;IACvC,CAAC;CACF;AAzCD,kCAyCC"}

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-forward.d.ts

@@ -0,0 +1,8 @@
+import { ForwardCategoryRefactorer } from '../workflow/forward-category-refactorer';
+export declare const DYNAMO_TABLE_TYPE = "AWS::DynamoDB::Table";
+export declare class StorageDynamoForwardRefactorer extends ForwardCategoryRefactorer {
+    protected fetchSourceStackId(): Promise<string | undefined>;
+    protected fetchDestStackId(): Promise<string | undefined>;
+    protected resourceTypes(): string[];
+}
+//# sourceMappingURL=storage-dynamo-forward.d.ts.map

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-forward.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-dynamo-forward.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,eAAO,MAAM,iBAAiB,yBAAyB,CAAC;AAOxD,qBAAa,8BAA+B,SAAQ,yBAAyB;cAC3D,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAIjD,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,SAAS,CAAC,aAAa,IAAI,MAAM,EAAE;CAGpC"}

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-forward.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageDynamoForwardRefactorer = exports.DYNAMO_TABLE_TYPE = void 0;
+const forward_category_refactorer_1 = require("../workflow/forward-category-refactorer");
+exports.DYNAMO_TABLE_TYPE = 'AWS::DynamoDB::Table';
+class StorageDynamoForwardRefactorer extends forward_category_refactorer_1.ForwardCategoryRefactorer {
+    async fetchSourceStackId() {
+        return this.findNestedStack(this.gen1Env, 'storage' + this.resource.resourceName);
+    }
+    async fetchDestStackId() {
+        return this.findNestedStack(this.gen2Branch, 'storage' + this.resource.resourceName);
+    }
+    resourceTypes() {
+        return [exports.DYNAMO_TABLE_TYPE];
+    }
+}
+exports.StorageDynamoForwardRefactorer = StorageDynamoForwardRefactorer;
+//# sourceMappingURL=storage-dynamo-forward.js.map

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-forward.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-dynamo-forward.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AAEvE,QAAA,iBAAiB,GAAG,sBAAsB,CAAC;AAOxD,MAAa,8BAA+B,SAAQ,uDAAyB;IACjE,KAAK,CAAC,kBAAkB;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpF,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvF,CAAC;IAES,aAAa;QACrB,OAAO,CAAC,yBAAiB,CAAC,CAAC;IAC7B,CAAC;CACF;AAZD,wEAYC"}

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.d.ts

@@ -0,0 +1,9 @@
+import { CFNResource } from '../../_infra/cfn-template';
+import { RollbackCategoryRefactorer } from '../workflow/rollback-category-refactorer';
+export declare class StorageDynamoRollbackRefactorer extends RollbackCategoryRefactorer {
+    protected fetchSourceStackId(): Promise<string | undefined>;
+    protected fetchDestStackId(): Promise<string | undefined>;
+    protected resourceTypes(): string[];
+    protected targetLogicalId(_sourceId: string, sourceResource: CFNResource): string | undefined;
+}
+//# sourceMappingURL=storage-dynamo-rollback.d.ts.map

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-dynamo-rollback.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAQtF,qBAAa,+BAAgC,SAAQ,0BAA0B;cAC7D,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAIjD,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,SAAS,CAAC,aAAa,IAAI,MAAM,EAAE;IAInC,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;CAQ9F"}

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageDynamoRollbackRefactorer = void 0;
+const rollback_category_refactorer_1 = require("../workflow/rollback-category-refactorer");
+const storage_dynamo_forward_1 = require("./storage-dynamo-forward");
+class StorageDynamoRollbackRefactorer extends rollback_category_refactorer_1.RollbackCategoryRefactorer {
+    async fetchSourceStackId() {
+        return this.findNestedStack(this.gen2Branch, 'storage' + this.resource.resourceName);
+    }
+    async fetchDestStackId() {
+        return this.findNestedStack(this.gen1Env, 'storage' + this.resource.resourceName);
+    }
+    resourceTypes() {
+        return [storage_dynamo_forward_1.DYNAMO_TABLE_TYPE];
+    }
+    targetLogicalId(_sourceId, sourceResource) {
+        switch (sourceResource.Type) {
+            case storage_dynamo_forward_1.DYNAMO_TABLE_TYPE:
+                return 'DynamoDBTable';
+            default:
+                return undefined;
+        }
+    }
+}
+exports.StorageDynamoRollbackRefactorer = StorageDynamoRollbackRefactorer;
+//# sourceMappingURL=storage-dynamo-rollback.js.map

package/lib/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-dynamo-rollback.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts"],"names":[],"mappings":";;;AACA,2FAAsF;AACtF,qEAA6D;AAO7D,MAAa,+BAAgC,SAAQ,yDAA0B;IACnE,KAAK,CAAC,kBAAkB;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvF,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpF,CAAC;IAES,aAAa;QACrB,OAAO,CAAC,0CAAiB,CAAC,CAAC;IAC7B,CAAC;IAES,eAAe,CAAC,SAAiB,EAAE,cAA2B;QACtE,QAAQ,cAAc,CAAC,IAAI,EAAE,CAAC;YAC5B,KAAK,0CAAiB;gBACpB,OAAO,eAAe,CAAC;YACzB;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;CACF;AArBD,0EAqBC"}