cdk-dia 0.3.0 → 0.6.1

package/{src → dist/src}/diagram/aws/aws-edge-resolver.js

@@ -24,6 +24,7 @@ const _ = __importStar(require("lodash"));
 const uniqueid_1 = require("@aws-cdk/core/lib/private/uniqueid");
 const component_1 = require("../component/component");
 const aws_diagram_generator_1 = require("./aws-diagram-generator");
+const edge_target_1 = require("./edge-target");
 class AwsEdgeResolver {
     resolveEdges(tree, diagram) {
         this.addEdges(tree, diagram);
@@ -41,66 +42,83 @@ class AwsEdgeResolver {
     }
     addEdge(targetString, originComponent) {
         const cdkStackTree = originComponent.treeAncestorWithTag(component_1.ComponentTags.isCdkStack, "true");
-        let targetComponent = this.findTargetComponent(cdkStackTree, targetString);
-        if (targetComponent != null) {
-            originComponent.links.addLink(targetComponent);
+        if (cdkStackTree) {
+            let targetComponent = this.findTargetComponent(cdkStackTree, targetString);
+            if (targetComponent != null) {
+                originComponent.links.addLink(targetComponent);
+            }
         }
     }
     findTargetComponent(cdkStackTree, targetString) {
-        const perfectMatch = cdkStackTree.subTreeFindComponent((component) => {
-            const uniqueResourceId = this.findUniqueResourceId(component);
-            return targetString === uniqueResourceId;
-        });
-        if (perfectMatch != null)
-            return perfectMatch;
-        return cdkStackTree.subTreeFindComponent((component) => {
-            const uniqueResourceId = this.findUniqueResourceId(component);
-            return targetString.toLowerCase() === uniqueResourceId;
-        });
+        if (targetString instanceof edge_target_1.EdgeTargetSimpleString) {
+            const perfectMatch = cdkStackTree.subTreeFindComponent((component) => {
+                const uniqueResourceId = this.findUniqueResourceId(component);
+                return targetString.value === uniqueResourceId;
+            });
+            if (perfectMatch != null)
+                return perfectMatch;
+            return cdkStackTree.subTreeFindComponent((component) => {
+                const uniqueResourceId = this.findUniqueResourceId(component);
+                return targetString.value.toLowerCase() === uniqueResourceId;
+            });
+        }
+        if (targetString instanceof edge_target_1.EdgeTargetStackExport) {
+            const treeRoot = cdkStackTree.treeRoot();
+            const exportingStack = treeRoot.subTreeFindComponent((component) => {
+                return component.tags.get(component_1.ComponentTags.isCdkStack) && component.id == targetString.stackId;
+            });
+            if (exportingStack && exportingStack.stackExportsContainer) {
+                const targetComponentIdInTargetStack = exportingStack.stackExportsContainer.getExport(targetString);
+                return exportingStack.subTreeFindComponent(component => {
+                    return this.findUniqueResourceId(component) == targetComponentIdInTargetStack;
+                });
+            }
+        }
     }
     findUniqueResourceId(component) {
         const stackDepth = component.treeAncestorWithTag(component_1.ComponentTags.isCdkStack, "true");
         const pathParts = component.idPathParts().slice(stackDepth.depth());
         if (pathParts.length === 0)
             return false;
-        return uniqueid_1.makeUniqueId(pathParts);
+        return (0, uniqueid_1.makeUniqueId)(pathParts);
     }
     edgeTargets(node) {
         const props = node.attributes.get("aws:cdk:cloudformation:props");
         if (props == undefined)
             return Array();
-        const targets = Array.from(this.scrapePossibleEdgeTargets(props));
-        return targets.map(path => aws_diagram_generator_1.AwsDiagramGenerator.sanitizeComponentId(path));
+        return Array.from(this.scrapePossibleEdgeTargets(props));
     }
     scrapePossibleEdgeTargets(object) {
         if (object === null || typeof object === "string")
-            return new Set();
-        const edgeTargets = new Set();
+            return new Array();
+        const edgeTargets = new Array();
         for (const key in object) {
             if (key === "Fn::GetAtt" && object[key][0] !== undefined) {
                 this.scrapeAllStrings(object[key]).forEach(it => {
-                    edgeTargets.add(it);
+                    edgeTargets.push(it);
                 });
             }
+            if (key === "Fn::ImportValue" && object[key] !== undefined) {
+                try {
+                    edgeTargets.push(edge_target_1.EdgeTargetStackExport.fromFnImportValue(object[key]));
+                }
+                catch (e) { }
+            }
             if (key === "Ref" && (typeof object[key] === "string")) {
-                this.scrapeAllStrings(object[key]).forEach(it => {
-                    edgeTargets.add(it);
-                });
+                edgeTargets.push(new edge_target_1.EdgeTargetSimpleString(object[key]));
             }
             this.scrapePossibleEdgeTargets(object[key]).forEach(target => {
-                edgeTargets.add(target);
+                edgeTargets.push(target);
             });
         }
-        return edgeTargets;
+        return _.uniqWith(edgeTargets, ((a, b) => a.isEqual(b)));
     }
     scrapeAllStrings(object) {
         if (object === null || object === undefined) {
             return new Set();
         }
         if (typeof object === "string") {
-            const set = new Set();
-            set.add(object);
-            return set;
+            return new Set([new edge_target_1.EdgeTargetSimpleString(object)]);
         }
         if (Array.isArray(object)) {
             const array = object.map(it => {
@@ -113,10 +131,10 @@ class AwsEdgeResolver {
         if (typeof object === "object") {
             for (const key in object) {
                 if (key === "Fn::GetAtt" && object[key][0] !== undefined) {
-                    edgeTargets.add(object[key][0]);
+                    edgeTargets.add(new edge_target_1.EdgeTargetSimpleString(object[key][0]));
                 }
                 if (key === "Ref" && (typeof object[key] === "string")) {
-                    edgeTargets.add(object[key]);
+                    edgeTargets.add(new edge_target_1.EdgeTargetSimpleString(object[key]));
                 }
                 this.scrapePossibleEdgeTargets(object[key]).forEach(target => {
                     edgeTargets.add(target);

package/dist/src/diagram/aws/aws-edge-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-edge-resolver.js","sourceRoot":"","sources":["../../../../src/diagram/aws/aws-edge-resolver.ts"],"names":[],"mappings":"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"}

package/{src → dist/src}/diagram/aws/awsResouceIconMatches.json

@@ -71,20 +71,34 @@
             "C4": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C4-Instance_48_Dark.png",
             "C5": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C5-Instance_48_Dark.png",
             "C5N": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C5n-Instance_48_Dark.png",
+            "C5A": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C5a-Instance_48_Dark.png",
+            "C5D": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C5d-Instance_48_Dark.png",
+            "C5AD": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C5ad-Instance_48_Dark.png",
             "C6G": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_C6g-Instance_48_Dark.png",
             "D2": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_D2-Instance_48_Dark.png",
+            "D3": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_D3-Instance_48_Dark.png",
+            "D3EN": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_D3en-Instance_48_Dark.png",
             "DB": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_DB-Instance_48_Dark.png",
             "F1": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_F1-Instance_48_Dark.png",
             "G3": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_G3-Instance_48_Dark.png",
+            "G4AD": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_G4ad-Instance_48_Dark.png",
+            "G4DN": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_G4dn-Instance_48_Dark.png",
             "H1": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_H1-Instance_48_Dark.png",
+            "I2": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_I2-Instance_48_Dark.png",
             "I3": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_I3-Instance_48_Dark.png",
+            "I3EN": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_I3en-Instance_48_Dark.png",
+            "INF1": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_Inf1-Instance_48_Dark.png",
             "M4": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_M4-Instance_48_Dark.png",
             "M5": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_M5-Instance_48_Dark.png",
             "M5A": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_M5a-Instance_48_Dark.png",
             "M5N": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_M5n-Instance_48_Dark.png",
             "M6G": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_M6g-Instance_48_Dark.png",
+            "MAC": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_Mac-Instance_48_Dark.png",
             "P2": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_P2-Instance_48_Dark.png",
             "P3": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_P3-Instance_48_Dark.png",
+            "P3DN": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_P3dn-Instance_48_Dark.png",
+            "P4": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_P4-Instance_48_Dark.png",
+            "P4D": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_P4d-Instance_48_Dark.png",
             "R4": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_R4-Instance_48_Dark.png",
             "R5": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_R5-Instance_48_Dark.png",
             "R5A": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_R5a-Instance_48_Dark.png",
@@ -93,6 +107,8 @@
             "T2": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_T2-Instance_48_Dark.png",
             "T3": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_T3-Instance_48_Dark.png",
             "T3A": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_T3a-Instance_48_Dark.png",
+            "T4G": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_T4g-Instance_48_Dark.png",
+            "TRAINIUM": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_Trainium-Instance_48_Dark.png",
             "X1": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_X1-Instance_48_Dark.png",
             "X1E": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_X1e-Instance_48_Dark.png",
             "Z1D": "icons/aws/Resource/Res_Compute/Res_48_Dark/Res_Amazon-EC2_Z1D-Instance_48_Dark.png"
@@ -228,7 +244,7 @@
       },
       {
         "resourceType": "AWS::EC2::SecurityGroup",
-        "filePath": null
+        "filePath": "icons/aws/security_group.png"
       },
       {
         "resourceType": "AWS::EC2::TrafficMirrorFilterRule",
@@ -1226,6 +1242,7 @@
   },
   {
     "resourcePrefix": "AWS::Cognito",
+    "genericFilePath": "icons/aws/Service/Arch_Security-Identity-Compliance/64/Arch_Amazon-Cognito_64.png",
     "specificResources": [
       {
         "resourceType": "AWS::Cognito::UserPoolRiskConfigurationAttachment",
@@ -2166,7 +2183,7 @@
     "specificResources": [
       {
         "resourceType": "AWS::Logs::MetricFilter",
-        "filePath": "icons/aws/Resource/Res_Management-Governance/Res_48_Dark/Res_Amazon-Cloudwatch_Logs_48_Dark_gen.png"
+        "filePath": "icons/aws/cloudwatch_metric_filter.png"
       },
       {
         "resourceType": "AWS::Logs::SubscriptionFilter",
@@ -2178,11 +2195,11 @@
       },
       {
         "resourceType": "AWS::Logs::LogGroup",
-        "filePath": null
+        "filePath": "icons/aws/Resource/Res_Management-Governance/Res_48_Dark/Res_Amazon-Cloudwatch_Logs_48_Dark_gen.png"
       },
       {
         "resourceType": "AWS::Logs::LogStream",
-        "filePath": null
+        "filePath": "icons/aws/Resource/Res_Management-Governance/Res_48_Dark/Res_Amazon-Cloudwatch_Logs_48_Dark_gen.png"
       }
     ]
   },

package/dist/src/diagram/aws/edge-target.d.ts

@@ -0,0 +1,17 @@
+export declare abstract class EdgeTarget {
+    abstract isEqual(other: EdgeTarget): any;
+}
+export declare class EdgeTargetSimpleString extends EdgeTarget {
+    value: string;
+    constructor(value: string);
+    isEqual(other: EdgeTarget): any;
+    toString(): string;
+}
+export declare class EdgeTargetStackExport extends EdgeTarget {
+    stackId: string;
+    exportValue: string;
+    constructor(stackId: string, exportValue: string);
+    static fromFnImportValue(value: string): EdgeTargetStackExport;
+    isEqual(other: EdgeTarget): any;
+    toString(): string;
+}

package/dist/src/diagram/aws/edge-target.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EdgeTargetStackExport = exports.EdgeTargetSimpleString = exports.EdgeTarget = void 0;
+const aws_diagram_generator_1 = require("./aws-diagram-generator");
+class EdgeTarget {
+}
+exports.EdgeTarget = EdgeTarget;
+class EdgeTargetSimpleString extends EdgeTarget {
+    constructor(value) {
+        super();
+        this.value = aws_diagram_generator_1.AwsDiagramGenerator.sanitizeComponentId(value);
+    }
+    isEqual(other) {
+        if (!(other instanceof EdgeTargetSimpleString))
+            return false;
+        return this.value == other.value;
+    }
+    toString() {
+        return `EdgeTargetSimpleString: ${this.value}`;
+    }
+}
+exports.EdgeTargetSimpleString = EdgeTargetSimpleString;
+class EdgeTargetStackExport extends EdgeTarget {
+    constructor(stackId, exportValue) {
+        super();
+        this.stackId = stackId;
+        this.exportValue = exportValue;
+    }
+    static fromFnImportValue(value) {
+        const matches = value.match(/([^:]*):(.*)/);
+        if (!matches)
+            throw new Error(`FnImportValue not in expected form: ${value}`);
+        return new EdgeTargetStackExport(matches[1], matches[2]);
+    }
+    isEqual(other) {
+        if (!(other instanceof EdgeTargetStackExport))
+            return false;
+        return this.exportValue == other.exportValue && this.stackId == other.stackId;
+    }
+    toString() {
+        return `EdgeTargetStackExport: ${this.stackId} ${this.exportValue}`;
+    }
+}
+exports.EdgeTargetStackExport = EdgeTargetStackExport;
+//# sourceMappingURL=edge-target.js.map

package/dist/src/diagram/aws/edge-target.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-target.js","sourceRoot":"","sources":["../../../../src/diagram/aws/edge-target.ts"],"names":[],"mappings":";;;AAAA,mEAA2D;AAE3D,MAAsB,UAAU;CAE/B;AAFD,gCAEC;AAED,MAAa,sBAAuB,SAAQ,UAAU;IAGlD,YAAY,KAAa;QACrB,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,KAAK,GAAG,2CAAmB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,KAAiB;QACrB,IAAI,CAAC,CAAC,KAAK,YAAa,sBAAsB,CAAC;YAAE,OAAO,KAAK,CAAA;QAE7D,OAAO,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAA;IACpC,CAAC;IAGD,QAAQ;QACJ,OAAO,2BAA2B,IAAI,CAAC,KAAK,EAAE,CAAA;IAClD,CAAC;CACJ;AAlBD,wDAkBC;AAED,MAAa,qBAAsB,SAAQ,UAAU;IAEjD,YAAmB,OAAe,EAAS,WAAmB;QAC1D,KAAK,EAAE,CAAA;QADQ,YAAO,GAAP,OAAO,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAQ;IAE9D,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,KAAa;QAClC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAE3C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAA;QAE7E,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,OAAO,CAAC,KAAiB;QACrB,IAAI,CAAC,CAAC,KAAK,YAAa,qBAAqB,CAAC;YAAE,OAAO,KAAK,CAAA;QAE5D,OAAO,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAA;IACjF,CAAC;IAED,QAAQ;QACJ,OAAO,0BAA0B,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAA;IACvE,CAAC;CACJ;AAvBD,sDAuBC"}

package/dist/src/diagram/aws/stack-exports-container.d.ts

@@ -0,0 +1,8 @@
+import * as cdk from "../../cdk";
+import { EdgeTargetStackExport } from "./edge-target";
+export declare class StackExportsContainer {
+    private readonly exports;
+    private constructor();
+    static fromComponent(exportsComponent: cdk.Node): StackExportsContainer;
+    getExport(edgeTargetStackExport: EdgeTargetStackExport): string | undefined;
+}

package/dist/src/diagram/aws/stack-exports-container.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StackExportsContainer = void 0;
+const uniqueid_1 = require("@aws-cdk/core/lib/private/uniqueid");
+class StackExport {
+    constructor(targetId, fullId) {
+        this.targetId = targetId;
+        this.fullId = fullId;
+    }
+}
+class StackExportsContainer {
+    constructor() {
+        this.exports = [];
+    }
+    static fromComponent(exportsComponent) {
+        const container = new StackExportsContainer();
+        exportsComponent.children.forEach(exportNode => {
+            const matches = exportNode.id.match(new RegExp('Output\{"Ref":"(.*)"\}'));
+            if (matches) {
+                const refTargetId = matches[1];
+                container.exports.push(new StackExport(refTargetId, exportNode.id));
+            }
+        });
+        return container;
+    }
+    getExport(edgeTargetStackExport) {
+        const stackExport = this.exports.find(stackExport => {
+            const calculatedExportName = (0, uniqueid_1.makeUniqueId)(['Exports', stackExport.fullId]);
+            return calculatedExportName == edgeTargetStackExport.exportValue;
+        });
+        return stackExport ? stackExport.targetId : undefined;
+    }
+}
+exports.StackExportsContainer = StackExportsContainer;
+//# sourceMappingURL=stack-exports-container.js.map

package/dist/src/diagram/aws/stack-exports-container.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stack-exports-container.js","sourceRoot":"","sources":["../../../../src/diagram/aws/stack-exports-container.ts"],"names":[],"mappings":";;;AACA,iEAA+D;AAG/D,MAAM,WAAW;IACb,YACa,QAAgB,EAChB,MAAc;QADd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,WAAM,GAAN,MAAM,CAAQ;IACxB,CAAC;CACP;AAED,MAAa,qBAAqB;IAI9B;QAFiB,YAAO,GAAkB,EAAE,CAAA;IAErB,CAAC;IAExB,MAAM,CAAC,aAAa,CAAC,gBAA0B;QAC3C,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAA;QAE7C,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAE,UAAU,CAAC,EAAE;YAE5C,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,KAAK,CAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAA;YAC1E,IAAI,OAAO,EAAC;gBACR,MAAM,WAAW,GAAW,OAAO,CAAC,CAAC,CAAC,CAAA;gBACtC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;aACtE;QACL,CAAC,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,SAAS,CAAC,qBAA4C;QAElD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAChD,MAAM,oBAAoB,GAAG,IAAA,uBAAY,EAAC,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;YAC1E,OAAO,oBAAoB,IAAI,qBAAqB,CAAC,WAAW,CAAA;QACpE,CAAC,CAAC,CAAA;QAEF,OAAO,WAAW,CAAA,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;IACxD,CAAC;CACJ;AA7BD,sDA6BC"}

package/{src → dist/src}/diagram/component/component.d.ts

@@ -2,6 +2,7 @@ import { ComponentLinks } from "../component-links";
 import { Link } from "./link";
 import { ComponentIcon } from "./icon";
 import { RootComponent } from "./root-component";
+import { StackExportsContainer } from "../aws/stack-exports-container";
 export declare type ComponentId = string;
 export declare enum ComponentTags {
     isCdkStack = "isCdkStack",
@@ -11,6 +12,7 @@ export declare enum ComponentTags {
 export declare abstract class Component {
     protected constructor(id: ComponentId);
     private _id;
+    stackExportsContainer: StackExportsContainer;
     idPathParts: () => Array<string>;
     get id(): ComponentId;
     private setId;
@@ -46,6 +48,6 @@ export declare abstract class Component {
     private subTreeReverseLinksRec;
     subTreeLinks(): Array<Link>;
     private subTreeLinksRec;
-    treeAncestorWithTag(tagKey: ComponentTags, tagVal: string): Component;
+    treeAncestorWithTag(tagKey: ComponentTags, tagVal: string): Component | undefined;
     isAncestor(possibleAncestor: Component): boolean;
 }

package/{src → dist/src}/diagram/component/component.js

@@ -177,7 +177,12 @@ class Component {
     treeAncestorWithTag(tagKey, tagVal) {
         if (this.tags.get(tagKey) === tagVal)
             return this;
-        return this.parent().treeAncestorWithTag(tagKey, tagVal);
+        try {
+            return this.parent().treeAncestorWithTag(tagKey, tagVal);
+        }
+        catch (e) {
+            return undefined;
+        }
     }
     isAncestor(possibleAncestor) {
         try {

package/{src → dist/src}/diagram/component/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/diagram/component/component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA2B;AAC3B,wDAAiD;AACjD,iCAA2B;AAM3B,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,0CAAyB,CAAA;IACzB,4DAA2C,CAAA;AAC/C,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAKD,MAAsB,SAAS;IAE3B,YAAsB,EAAe;QASrC,gBAAW,GAAG,GAAkB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAW9C,SAAI,GAAyB,IAAI,CAAA;QAExC,SAAI,GAAuB,IAAI,GAAG,EAAkB,CAAA;QAE5C,mBAAc,GAAmB,IAAI,GAAG,EAAa,CAAA;QAiKrD,WAAM,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,CAAA;QAxLrC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAClB,CAAC;IASD,IAAW,EAAE;QACT,OAAO,IAAI,CAAC,GAAG,CAAA;IACnB,CAAC;IAEO,KAAK,CAAC,KAAkB;QAC5B,IAAI,CAAC,GAAG,GAAG,KAAK,CAAA;IACpB,CAAC;IASM,aAAa;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC1C,CAAC;IAiBD,kBAAkB,CAAC,SAAoB;QACnC,SAAS,CAAC,YAAY,EAAE,CAAA;QACxB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACzC,CAAC;IAED,eAAe,CAAC,SAAoB;QAChC,IAAI,CAAC,yCAAyC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAE5D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC;IAED,gCAAgC;QAC5B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACvC,IAAI,CAAC,mCAAmC,CAAC,YAAY,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAa,CAAA;IAC9C,CAAC;IAED,mBAAmB,CAAC,SAAoB,EAAE,YAAuB;QAG7D,MAAM,wBAAwB,GAAG,SAAS,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAA;QAC7E,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1C,IAAI,UAAU,KAAK,YAAY,EAAE;gBAC7B,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;aAC7D;QACL,CAAC,CAAC,CAAA;QAGF,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAA;QAC9D,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC5B,IAAI,IAAI,KAAK,YAAY,EAAE;gBACvB,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;aACnC;QACL,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;QAClC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;IACtC,CAAC;IAEO,mCAAmC,CAAC,IAAe;QACvD,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACvC,IAAI,CAAC,mCAAmC,CAAC,YAAY,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,EAAE,CAAA;IACvB,CAAC;IAEM,gBAAgB;QACnB,IAAI,CAAC,MAAM,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAED,gBAAgB;QAGZ,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,mBAAmB,EAAE,CAAA;QAC/D,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAE,IAAI,CAAC,MAAM,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;aAC3D;QACL,CAAC,CAAC,CAAA;QAGF,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAA;QAChE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBACxC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;QAGF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,CAAA;QACjD,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAE,IAAI,CAAC,MAAM,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACvC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,EAAE,CAAC,gCAAgC,EAAE,CAAA;IACpD,CAAC;IAKD,mBAAmB;QAEf,MAAM,MAAM,GAAG,IAAI,GAAG,EAAe,CAAA;QACrC,IAAI,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,GAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA,CAAA,CAAC,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,oBAAoB,CAAC,MAAiB;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAE3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACnC,OAAO,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAA;IACpC,CAAC;IAED,yBAAyB,CAAC,MAA2B;QACjD,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEO,qBAAqB,CAAC,OAAkB,EAAE,MAA2B;QACzE,MAAM,CAAC,OAAO,CAAC,CAAA;QACf,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,wBAAwB,CAAC,EAAU;QAC/B,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,SAAS,CAAC,EAAE,IAAI,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;IAED,oBAAoB,CAAC,SAAiC;QAClD,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACxD,CAAC;IAEO,uBAAuB,CAAC,OAAkB,EAAE,SAAiC;QAEjF,IAAI,SAAS,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAA;QAEtC,OAAO,OAAO,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACpC,OAAO,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACT,OAAO,EAAE,IAAI,IAAI,CAAA;QACrB,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,iBAAiB;QAErB,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACxD,OAAO,GAAG,CAAC,iBAAiB,EAAE,CAAA;QAClC,CAAC,CAAC,CAAC,CAAA;QACH,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IACpC,CAAC;IAOD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAKD,mBAAmB,CAAC,QAAQ,GAAG,IAAI;QAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IACtD,CAAC;IAEO,sBAAsB,CAAC,OAAkB,EAAE,WAAW,GAAG,IAAI;QAEjE,MAAM,OAAO,GAAW,EAAE,CAAA;QAE1B,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,WAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;SAC7G;QAED,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAClB,CAAC;IAKD,YAAY;QACR,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAEO,eAAe,CAAC,OAAkB;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,WAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;QAElG,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,mBAAmB,CAAC,MAAqB,EAAE,MAAc;QACpD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM;YAAE,OAAO,IAAI,CAAA;QAElD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;IAC3D,CAAC;IAED,UAAU,CAAC,gBAA2B;QAClC,IAAI;YACA,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,gBAAgB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;SACzF;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CACJ;AArPD,8BAqPC"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/diagram/component/component.ts"],"names":[],"mappings":"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"}

package/{src → dist/src}/diagram/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./diagram";
 export * from "./component/component";
+export * from "./component/customizable-attribute";
 export * from "./component/diagram-component";
 export * from "./component/root-component";
 export * from "./component/link";

package/{src → dist/src}/diagram/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./diagram"), exports);
 __exportStar(require("./component/component"), exports);
+__exportStar(require("./component/customizable-attribute"), exports);
 __exportStar(require("./component/diagram-component"), exports);
 __exportStar(require("./component/root-component"), exports);
 __exportStar(require("./component/link"), exports);

package/{src → dist/src}/diagram/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/diagram/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAyB;AACzB,wDAAqC;AACrC,gEAA6C;AAC7C,6DAA0C;AAC1C,mDAAgC;AAChC,oDAAiC;AACjC,0DAAuC;AACvC,8DAA2C;AAC3C,0DAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/diagram/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAyB;AACzB,wDAAqC;AACrC,qEAAkD;AAClD,gEAA6C;AAC7C,6DAA0C;AAC1C,mDAAgC;AAChC,oDAAiC;AACjC,0DAAuC;AACvC,8DAA2C;AAC3C,0DAAuC"}

package/{src → dist/src}/diagram/tests/aws-edge-resolver.test.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const aws_edge_resolver_1 = require("../aws/aws-edge-resolver");
+const edge_target_1 = require("../aws/edge-target");
 describe("candidate target edges are well scraped from any thing", () => {
     it(`sample no.1`, () => {
         const haystack = {
@@ -17,9 +18,12 @@ describe("candidate target edges are well scraped from any thing", () => {
             ]
         };
         const targets = new aws_edge_resolver_1.AwsEdgeResolver().scrapePossibleEdgeTargets(haystack);
-        expect(targets.has("mayQueue111")).toBeTruthy();
-        expect(targets.has("QueueName")).toBeTruthy();
-        expect(targets.size).toEqual(2);
+        const expectedTargetValues = [
+            new edge_target_1.EdgeTargetSimpleString("mayQueue111"),
+            new edge_target_1.EdgeTargetSimpleString("QueueName")
+        ];
+        expectTargetValuesToBeInSet(targets, expectedTargetValues);
+        expect(targets.length).toEqual(2);
     });
     it(`sample no.2`, () => {
         const haystack = {
@@ -176,14 +180,22 @@ describe("candidate target edges are well scraped from any thing", () => {
             }
         };
         const targets = new aws_edge_resolver_1.AwsEdgeResolver().scrapePossibleEdgeTargets(haystack);
-        expect(targets.has("queue333")).toBeTruthy();
-        expect(targets.has("queue123")).toBeTruthy();
-        expect(targets.has("topic123")).toBeTruthy();
-        expect(targets.has("bkt1")).toBeTruthy();
-        expect(targets.has("table123")).toBeTruthy();
-        expect(targets.has("queue222")).toBeTruthy();
-        expect(targets.size).toEqual(7);
+        const expectedTargetValues = [
+            new edge_target_1.EdgeTargetSimpleString("queue333"),
+            new edge_target_1.EdgeTargetSimpleString("queue123"),
+            new edge_target_1.EdgeTargetSimpleString("topic123"),
+            new edge_target_1.EdgeTargetSimpleString("bkt1"),
+            new edge_target_1.EdgeTargetSimpleString("table123"),
+            new edge_target_1.EdgeTargetSimpleString("queue222")
+        ];
+        expectTargetValuesToBeInSet(targets, expectedTargetValues);
+        expect(targets.length).toEqual(7);
     });
+    function expectTargetValuesToBeInSet(targets, expectedTargetInArray) {
+        expectedTargetInArray.forEach(targetValue => {
+            expect(targets).arrayToContainEdgeTarget(targetValue);
+        });
+    }
     it(`sample no.3`, () => {
         const haystack = {
             "policyDocument": {
@@ -213,10 +225,59 @@ describe("candidate target edges are well scraped from any thing", () => {
             }
         };
         const targets = new aws_edge_resolver_1.AwsEdgeResolver().scrapePossibleEdgeTargets(haystack);
-        expect(targets.has("TopicX")).toBeTruthy();
-        expect(targets.has("queueX2")).toBeTruthy();
-        expect(targets.has("Arn")).toBeTruthy();
-        expect(targets.size).toEqual(3);
+        const expectedTargetValues = [
+            new edge_target_1.EdgeTargetSimpleString("TopicX"),
+            new edge_target_1.EdgeTargetSimpleString("queueX2"),
+            new edge_target_1.EdgeTargetSimpleString("Arn")
+        ];
+        expectTargetValuesToBeInSet(targets, expectedTargetValues);
+        expect(targets.length).toEqual(3);
     });
+    it(`sample no.4 `, () => {
+        const haystack = {
+            "dimensions": [
+                {
+                    "name": "QueueName",
+                    "value": {
+                        "Fn::GetAtt": [
+                            "mayQueue111",
+                            "QueueName"
+                        ]
+                    }
+                },
+                {
+                    "name": "QueueName2",
+                    "value": {
+                        "Fn::ImportValue": "stack-name-here:export-name-here"
+                    }
+                }
+            ]
+        };
+        const targets = new aws_edge_resolver_1.AwsEdgeResolver().scrapePossibleEdgeTargets(haystack);
+        const expectedTargetValues = [
+            new edge_target_1.EdgeTargetSimpleString("mayQueue111"),
+            new edge_target_1.EdgeTargetSimpleString("QueueName"),
+            new edge_target_1.EdgeTargetStackExport('stack-name-here', 'export-name-here')
+        ];
+        expectTargetValuesToBeInSet(targets, expectedTargetValues);
+        expect(targets.length).toEqual(3);
+    });
+});
+expect.extend({
+    arrayToContainEdgeTarget(array, expected) {
+        const foundTarget = array.find((target) => target.isEqual(expected));
+        if (foundTarget) {
+            return {
+                message: () => `Found ${expected} in array`,
+                pass: true
+            };
+        }
+        else {
+            return {
+                message: () => `array does not contain expected EdgeTarget:${expected}`,
+                pass: false
+            };
+        }
+    }
 });
 //# sourceMappingURL=aws-edge-resolver.test.js.map