cdk-dia 0.0.4 → 0.4.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Tom Roshko @Pistazie
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,10 +1,11 @@
 [![Mentioned in Awesome CDK](https://awesome.re/mentioned-badge.svg)](https://github.com/kolomied/awesome-cdk)
 ![Test](https://github.com/pistazie/cdk-dia/workflows/Test/badge.svg)
 [![npm version](https://badge.fury.io/js/cdk-dia.svg)](https://badge.fury.io/js/cdk-dia)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
 
 # 🎡 CDK-Dia - Automated diagrams for CDK infrastructure
 
-_Cdk-dia diagrams your CDK provisioned infrastructure using the Grpahviz dot lanuguage._
+_Cdk-dia diagrams your CDK provisioned infrastructure using the Graphviz dot lanuguage._
 
 ## Example
 
@@ -13,7 +14,7 @@ This Diagram was automatically generated from an AWS CDK stack
     <img src="docs/diagram.png" />
 </p>
 
-## Getting started
+## Getting started - Typescript / Javascript
 Add cdk-dia to your CDK project
 ```sh
 $ npm install cdk-dia
@@ -37,12 +38,39 @@ $ npx cdk-dia
 ```
 <br/>
 
+## Getting started - any other CDK language
+Globally install cdk-dia
+```sh
+$ npm install cdk-dia -g
+```
+
+Install Graphviz
+```sh
+$ brew install graphviz
+```
+* If you don't use brew: Graphviz installation in many environments is [well documented](https://graphviz.org/download/).
+* make sure Graphviz's dot binary is available in your PATH.
+
+Synthesize your CDK application
+```sh
+$ cdk synth
+```
+
+Generate a CDK-DIA diagram
+```sh
+$ cdk-dia
+```
+<br/>
+
 ## Customize diagrams
 
 In some cases it is useful to be able to tweak a diagram. For this purpose CDK-DIA includes customizers/decorators
 you can use with your CDK constructs in order to tweak the diagram.
 
-* In order to customize you have to add cdk-dia as a npm project dependency (globally installing it using `npm -g` won't allow you to use the `CdkDiaDecorator` class)
+### Limitations:
+
+* Customization and decorators are currently only support for Typescript/Javascript CDK projects.
+* In order to customize you have to add cdk-dia as a npm project dependency (globally installing it using `npm i -g` won't allow you to use the `CdkDiaDecorator` class)
 
 ### Example:
 Consider the following diagram of a 3-Tier CDK Stack:
@@ -63,4 +91,9 @@ This results in a Diagram where the DB-Tier was not collapsed providing more det
 * a full example or the above can be found at [examples/decoration-example](examples/decoration-example)
 
 ## CLI arguments
-```npx cdk-dia --help``` - Get possible arguments
+* ```npx cdk-dia --help``` - Get possible arguments
+* ```npx cdk-dia --stacks stackOne stackFour``` - only diagram chosen aws-cdk stacks
+    * ```npx cdk-dia --stacks pipelinestack/prod/database``` - choose stacks by path (nested stacks, pipeline stacks)
+
+## 🙏🏽 Contributing
+Contribution is covered in the [CONTRIBUTING.md](./CONTRIBUTING.md) markdown.

package/{bin → dist/bin}/cli.js

@@ -24,41 +24,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
-const terminal_link_1 = __importDefault(require("terminal-link"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const path = __importStar(require("path"));
-const graphviz_1 = require("../src/graphviz");
 const cdk_dia_1 = require("../src/cdk-dia");
+const rendering = __importStar(require("../src/render/index"));
 async function initCli() {
     return yargs_1.default(process.argv.slice(2)).options({
         'cdk-tree-path': { type: 'string', alias: 'tree', default: 'cdk.out/tree.json', describe: 'Path of synthesized cdk cloud assembly' },
         'target-path': { type: 'string', alias: 'target', default: 'diagram.png', describe: 'Target path for rendered PNG' },
         'collapse': { type: 'boolean', default: true, describe: 'Collapse CDK Constructs' },
+        'stacks': { type: 'array', describe: 'Stacks to include (if not specified all stacks are diagramed)' }
     }).version(false).argv;
 }
 async function generateDiagram(args) {
-    const packageBasePath = path.dirname(require.resolve('cdk-dia/package.json'));
     const cdkDia = new cdk_dia_1.CdkDia();
-    cdkDia.generateDiagram(args["cdk-tree-path"], args["target-path"], packageBasePath, args.collapse).then((pngFilename) => {
-        if (terminal_link_1.default.isSupported)
-            console.log(chalk_1.default.green(`CDK code diagram generated to PNG at ${chalk_1.default.bold(terminal_link_1.default(pngFilename, pngFilename))}`));
-        else
-            console.log(chalk_1.default.green(`CDK code diagram generated to PNG at ${chalk_1.default.bold(pngFilename)}`));
-    }).catch(e => {
+    let includedStacks = false;
+    if (args.stacks !== undefined) {
+        includedStacks = args.stacks.map(it => it.toString());
+    }
+    const packageBasePath = path.dirname(require.resolve('../../package.json'));
+    cdkDia.generateDiagram(args["cdk-tree-path"], args["target-path"], args.collapse, packageBasePath, includedStacks)
+        .then((output) => output.userOutput())
+        .catch(e => {
         throw e;
     });
 }
 function printError(e) {
-    if (e instanceof graphviz_1.RenderingError) {
+    if (e instanceof rendering.RenderingError) {
         notifyRenderingError(e);
     }
     else {
-        console.log(e);
-        notifyRenderingError(new graphviz_1.RenderingError(`Unexpected error occurred: ${e.message}`));
+        notifyRenderingError(new rendering.RenderingError(`Unexpected error occurred: ${e.message}`));
     }
 }
 function notifyRenderingError(e) {
-    console.log(e);
     console.log(`${chalk_1.default.red.bold(`Failed to render diagram: ${e.message}`)}`);
     if (e.fixTips.length > 0)
         console.log(`${chalk_1.default.underline(`What could you try?`)}`);
@@ -66,7 +65,10 @@ function notifyRenderingError(e) {
         console.log(`\t${tip}`);
     });
 }
-initCli().then(args => {
-    generateDiagram(args).catch(printError);
-}).catch(printError);
+initCli()
+    .then(args => {
+    generateDiagram(args)
+        .catch(printError);
+})
+    .catch(printError);
 //# sourceMappingURL=cli.js.map

package/dist/bin/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAyB;AACzB,wDAA+B;AAC/B,2CAA4B;AAC5B,4CAAqC;AACrC,+DAAgD;AAEhD,KAAK,UAAU,OAAO;IAElB,OAAO,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACxC,eAAe,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,wCAAwC,EAAC;QAClI,aAAa,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,8BAA8B,EAAC;QAClH,UAAU,EAAE,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,yBAAyB,EAAC;QACjF,QAAQ,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,+DAA+D,EAAC;KACvG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAA;AAC1B,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAmB;IAE9C,MAAM,MAAM,GAAG,IAAI,gBAAM,EAAE,CAAA;IAE3B,IAAI,cAAc,GAAqB,KAAK,CAAA;IAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;QAC3B,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;KACxD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAA;IAE3E,MAAM,CAAC,eAAe,CAClB,IAAI,CAAC,eAAe,CAAC,EACrB,IAAI,CAAC,aAAa,CAAC,EACnB,IAAI,CAAC,QAAQ,EACb,eAAe,EACf,cAAc,CAAC;SACd,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;SACrC,KAAK,CAAC,CAAC,CAAC,EAAE;QACP,MAAM,CAAC,CAAA;IACX,CAAC,CAAC,CAAA;AACV,CAAC;AAED,SAAS,UAAU,CAAC,CAAC;IACjB,IAAI,CAAC,YAAY,SAAS,CAAC,cAAc,EAAE;QACvC,oBAAoB,CAAC,CAAC,CAAC,CAAA;KAC1B;SAAM;QACH,oBAAoB,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,8BAA8B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAChG;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,CAA2B;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;IAE1E,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAA;IAE5D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;AACN,CAAC;AAED,OAAO,EAAE;KACJ,IAAI,CAAC,IAAI,CAAC,EAAE;IACT,eAAe,CAAC,IAAI,CAAC;SAChB,KAAK,CAAC,UAAU,CAAC,CAAA;AAC1B,CAAC,CAAC;KACD,KAAK,CAAC,UAAU,CAAC,CAAA"}

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./src/cdk/construct-decorator";
+export * from "./src/cdk";
+export * from "./src/render/graphviz";
+export * from "./src/diagram";

package/dist/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./src/cdk/construct-decorator"), exports);
+__exportStar(require("./src/cdk"), exports);
+__exportStar(require("./src/render/graphviz"), exports);
+__exportStar(require("./src/diagram"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA6C;AAC7C,4CAAyB;AACzB,wDAAqC;AACrC,gDAA6B"}

package/{src → dist/src}/cdk/cdk-tree.d.ts

@@ -3,11 +3,21 @@ export declare class Tree {
     tree: Node;
     static fromObject(object: Record<string, unknown>): Tree;
 }
+export declare class ConstructInfoFqn {
+    static STACK: ConstructInfoFqn;
+    static STAGE: ConstructInfoFqn;
+    static APP: ConstructInfoFqn;
+    static CUSTOM_RESOURCE: ConstructInfoFqn;
+    static of: (val: string) => ConstructInfoFqn | undefined;
+    constructor(cdkVal: string);
+    readonly cdkVal: string;
+}
 export declare class Node {
     id: string;
     path: string;
     children: Map<string, Node>;
     attributes: Map<string, string | Node | Record<string, string>>;
+    constructInfoFqn: ConstructInfoFqn | undefined;
     pathParts: () => Array<string>;
     findInSubTree(predicate: (Node: any) => boolean): Node | null;
     static fromObject(object: Record<string, unknown | Record<string, string>>): Node;

package/{src → dist/src}/cdk/cdk-tree.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Node = exports.Tree = void 0;
+exports.Node = exports.ConstructInfoFqn = exports.Tree = void 0;
 class Tree {
     static fromObject(object) {
         const tree = new Tree();
@@ -10,8 +10,25 @@ class Tree {
     }
 }
 exports.Tree = Tree;
+class ConstructInfoFqn {
+    constructor(cdkVal) {
+        this.cdkVal = cdkVal;
+    }
+}
+exports.ConstructInfoFqn = ConstructInfoFqn;
+ConstructInfoFqn.STACK = new ConstructInfoFqn("@aws-cdk/core.Stack");
+ConstructInfoFqn.STAGE = new ConstructInfoFqn("@aws-cdk/core.Stage");
+ConstructInfoFqn.APP = new ConstructInfoFqn("@aws-cdk/core.App");
+ConstructInfoFqn.CUSTOM_RESOURCE = new ConstructInfoFqn("@aws-cdk/core.CustomResource");
+ConstructInfoFqn.of = (val) => [
+    ConstructInfoFqn.STACK,
+    ConstructInfoFqn.STAGE,
+    ConstructInfoFqn.APP,
+    ConstructInfoFqn.CUSTOM_RESOURCE
+].find(fqn => fqn.cdkVal === val);
 class Node {
     constructor() {
+        this.constructInfoFqn = undefined;
         this.pathParts = () => this.path.split("/");
     }
     findInSubTree(predicate) {
@@ -41,6 +58,9 @@ class Node {
                 node.attributes.set(attrKey, object['attributes'][attrKey]);
             }
         }
+        if (object['constructInfo'] != undefined && object['constructInfo']['fqn'] != undefined) {
+            node.constructInfoFqn = ConstructInfoFqn.of(object['constructInfo']['fqn']);
+        }
         return node;
     }
 }

package/dist/src/cdk/cdk-tree.js.map

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

package/dist/src/cdk-dia.d.ts

@@ -0,0 +1,4 @@
+import * as graphviz from "../src/render/graphviz";
+export declare class CdkDia {
+    generateDiagram(treeJsonPath: string, targetPath: string, collapse: boolean, cdkBasePath?: string, includedStacks?: string[] | false): Promise<graphviz.GraphvizRenderingOutput>;
+}

package/{src → dist/src}/cdk-dia.js

@@ -23,14 +23,16 @@ exports.CdkDia = void 0;
 const cdk = __importStar(require("../src/cdk"));
 const path = __importStar(require("path"));
 const diagrams = __importStar(require("../src/diagram"));
-const graphviz = __importStar(require("../src/graphviz"));
+const graphviz = __importStar(require("../src/render/graphviz"));
 class CdkDia {
-    async generateDiagram(treeJsonPath, targetPath, cdkBasePath = require.resolve('cdk-dia/package.json'), collapse) {
+    async generateDiagram(treeJsonPath, targetPath, collapse, cdkBasePath = require.resolve('cdk-dia/package.json'), includedStacks = false) {
         const cdkTree = cdk.TreeJsonLoader.load(path.isAbsolute(treeJsonPath) ? treeJsonPath : path.join(process.cwd(), treeJsonPath));
         const generator = new diagrams.AwsDiagramGenerator(new diagrams.AwsEdgeResolver(), new diagrams.AwsIconSupplier(`${cdkBasePath}`));
-        const diagram = generator.generate(cdkTree, collapse);
-        const renderer = new graphviz.Generator(diagram);
-        return renderer.generatePng(`${targetPath}`);
+        const diagram = generator.generate(cdkTree, collapse, includedStacks);
+        return new graphviz.Graphviz().render({
+            diagram: diagram,
+            path: `${targetPath}`
+        });
     }
 }
 exports.CdkDia = CdkDia;

package/dist/src/cdk-dia.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cdk-dia.js","sourceRoot":"","sources":["../../src/cdk-dia.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AACjC,2CAA4B;AAC5B,yDAA0C;AAC1C,iEAAkD;AAElD,MAAa,MAAM;IAEf,KAAK,CAAC,eAAe,CAAC,YAAoB,EACpB,UAAkB,EAClB,QAAiB,EACjB,cAAsB,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAC7D,iBAAmC,KAAK;QAG1D,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC,CAAA;QAG9H,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,eAAe,EAAE,EAAE,IAAI,QAAQ,CAAC,eAAe,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC,CAAA;QAClI,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;QAGrE,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;YAClC,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,GAAG,UAAU,EAAE;SACxB,CAAC,CAAA;IACN,CAAC;CACJ;AArBD,wBAqBC"}

package/{src → dist/src}/diagram/aws/aws-diagram-generator.d.ts

@@ -2,20 +2,21 @@ import * as cdk from "../../cdk";
 import { AwsEdgeResolver } from "./aws-edge-resolver";
 import { AwsIconSupplier, Diagram, DiagramGenerator } from "..";
 export declare class AwsDiagramGenerator extends DiagramGenerator {
-    static CDK_STACK_DEPTH: number;
-    static NON_DIAGRAMED_ID_PREFIXES: string[];
     private readonly edgeResolver;
     private readonly iconSupplier;
     constructor(edgeResolver: AwsEdgeResolver, iconSupplier: AwsIconSupplier);
-    generate(cdkTree: cdk.Tree, collapse: boolean): Diagram;
+    generate(cdkTree: cdk.Tree, collapse: boolean, includedStacks?: string[] | false): Diagram;
     private generateComponentsTree;
     private generateSubTree;
     private generateComponent;
+    private removeNonIncludedDiagrams;
+    private isStack;
+    private idIncluded;
     private applyAttributeSetCustomizers;
     private generateCfnComponent;
-    private cfnProps;
-    private hasCfnProps;
-    private removeNonDiagramedComponents;
+    private static cfnProps;
+    private static generateCfnProps;
+    private static hasCfnProps;
     private collapseCdkConstructs;
     private collapseSubtreeToNode;
     private removeCdkAssets;

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

@@ -1,28 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwsDiagramGenerator = void 0;
-const _ = __importStar(require("lodash"));
-const __1 = require("..");
 const cdk_1 = require("../../cdk");
+const __1 = require("..");
 const customizable_attribute_1 = require("../component/customizable-attribute");
 class AwsDiagramGenerator extends __1.DiagramGenerator {
     constructor(edgeResolver, iconSupplier) {
@@ -30,12 +10,13 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         this.edgeResolver = edgeResolver;
         this.iconSupplier = iconSupplier;
     }
-    generate(cdkTree, collapse) {
+    generate(cdkTree, collapse, includedStacks = false) {
         const diagram = new __1.Diagram();
         const cdkRoot = cdkTree.tree;
         diagram.root = this.generateComponentsTree(cdkRoot);
+        if (includedStacks !== false)
+            this.removeNonIncludedDiagrams(diagram, includedStacks);
         this.edgeResolver.resolveEdges(cdkRoot, diagram);
-        this.removeNonDiagramedComponents(diagram);
         if (collapse)
             this.collapseCdkConstructs(diagram.root);
         this.removeCdkAssets(diagram.root);
@@ -48,10 +29,12 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         const root = new __1.RootComponent(cdkRoot.id);
         cdkRoot.children.forEach((value) => {
             const component = this.generateSubTree(value, root);
-            if (component != null)
+            if (component != null && value.constructInfoFqn === undefined) {
                 component.tags.set(__1.ComponentTags.isCdkStack, "true");
-            if (component != null)
+            }
+            if (component != null) {
                 root.addSubComponent(component);
+            }
         });
         return root;
     }
@@ -67,22 +50,63 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         return component;
     }
     generateComponent(cdkNode, parentComponent) {
-        const { cfnType, label } = this.cfnProps(cdkNode);
+        const { cfnType, label } = AwsDiagramGenerator.cfnProps(cdkNode);
         let component;
         if (cfnType != null) {
             component = this.generateCfnComponent(cdkNode, cfnType, label, parentComponent);
         }
         else {
             const relevantNode = cdkNode.findInSubTree(node => {
-                return this.hasCfnProps(node);
+                return AwsDiagramGenerator.hasCfnProps(node);
             });
             if (relevantNode == null)
                 return null;
             component = new __1.DiagramComponent(AwsDiagramGenerator.sanitizeComponentId(cdkNode.path), [cdkNode.id], parentComponent);
         }
+        if (cdkNode.constructInfoFqn === cdk_1.ConstructInfoFqn.STACK) {
+            component.tags.set(__1.ComponentTags.isCdkStack, "true");
+        }
+        if (cdkNode.constructInfoFqn === cdk_1.ConstructInfoFqn.STAGE) {
+            component.tags.set(__1.ComponentTags.isCdkStage, "true");
+        }
         this.applyAttributeSetCustomizers(cdkNode, component);
         return component;
     }
+    removeNonIncludedDiagrams(diagram, includedStackIds) {
+        const excludedStacks = [];
+        const includedStacks = [];
+        diagram.root.subTreeApplyAllComponents((component) => {
+            const isStack = this.isStack(component);
+            const idIncluded = this.idIncluded(includedStackIds, component);
+            if (isStack) {
+                if (!idIncluded) {
+                    excludedStacks.push(component);
+                }
+                else {
+                    includedStacks.push(component);
+                }
+            }
+        });
+        diagram.root.subTreeApplyAllComponents((component) => {
+            const inExcludedStack = excludedStacks.find(excludedStack => component.isAncestor(excludedStack)) != null;
+            const inIncludedStack = includedStacks.find(includedStack => component.isAncestor(includedStack)) != null;
+            const isStack = this.isStack(component);
+            const isIncludedStack = excludedStacks.includes(component);
+            const containsIncludedStack = component.subTreeFindComponent(subComponent => {
+                return this.isStack(subComponent) && this.idIncluded(includedStackIds, subComponent);
+            });
+            if ((inExcludedStack && !inIncludedStack && !containsIncludedStack) ||
+                (isStack && !containsIncludedStack && isIncludedStack)) {
+                component.destroyAndDetach();
+            }
+        });
+    }
+    isStack(component) {
+        return component.tags.get(__1.ComponentTags.isCdkStack) == "true";
+    }
+    idIncluded(includedStacks, component) {
+        return includedStacks.map(it => it.toLowerCase()).includes(component.id.toLowerCase());
+    }
     applyAttributeSetCustomizers(tree, component) {
         tree.attributes.forEach((value, key) => {
             if (key.startsWith(cdk_1.CdkDia.attrPrefix)) {
@@ -90,6 +114,8 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
                     case customizable_attribute_1.CollapssingCustomizer.name:
                         customizable_attribute_1.CollapssingCustomizer.fromAttributeValue(value).customize(component);
                         break;
+                    default:
+                        throw new Error(`Unknown customizer ${key}`);
                 }
             }
         });
@@ -109,30 +135,23 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         component.label = component.label.filter(it => { return it.toUpperCase() != "RESOURCE"; });
         return component;
     }
-    cfnProps(tree) {
+    static cfnProps(tree) {
         const cfnTypeAttr = tree.attributes.get("aws:cdk:cloudformation:type");
         if (cfnTypeAttr !== undefined) {
-            const cfnType = cfnTypeAttr;
-            const label = cfnType.split("::").slice(1).join(" ");
-            return { cfnType: cfnType, label: label };
+            return AwsDiagramGenerator.generateCfnProps(cfnTypeAttr);
+        }
+        if (tree.constructInfoFqn === cdk_1.ConstructInfoFqn.CUSTOM_RESOURCE) {
+            return AwsDiagramGenerator.generateCfnProps("AWS::CloudFormation::CustomResource");
         }
         return { cfnType: null, label: null };
     }
-    hasCfnProps(tree) {
-        const { cfnType } = this.cfnProps(tree);
-        return cfnType != null;
-    }
-    removeNonDiagramedComponents(diagram) {
-        diagram.root.subTreeApplyAllComponents(component => {
-            if (component.subComponents().length == 0) {
-                const idParts = component.id.split("/");
-                if (idParts.length > 0 && _.find(AwsDiagramGenerator.NON_DIAGRAMED_ID_PREFIXES, prefix => {
-                    return idParts[idParts.length - 1].startsWith(prefix);
-                }) != undefined) {
-                    component.destroySelfWithFromParent();
-                }
-            }
-        });
+    static generateCfnProps(cfnType) {
+        const label = cfnType.split("::").slice(1).join(" ");
+        return { cfnType: cfnType, label: label };
+    }
+    static hasCfnProps(node) {
+        const { cfnType } = AwsDiagramGenerator.cfnProps(node);
+        return cfnType != null || node.constructInfoFqn !== undefined;
     }
     collapseCdkConstructs(node) {
         const collapsingCustomization = node.tags.get(__1.ComponentTags.collapssingOverride);
@@ -183,7 +202,10 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         root.subComponents().forEach(component => {
             const newComponent = this.collapseDoubleClusters(component);
             if (component !== newComponent) {
-                root.replaceSubComponent(component, newComponent);
+                if (component.tags.get(__1.ComponentTags.isCdkStack) !== "true" &&
+                    component.tags.get(__1.ComponentTags.isCdkStage) !== "true") {
+                    root.replaceSubComponent(component, newComponent);
+                }
             }
         });
         const components = root.subComponents();
@@ -194,14 +216,14 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
         return root;
     }
     removeCrossStackEdges(current) {
-        if ((current instanceof __1.DiagramComponent) && current.depth() > AwsDiagramGenerator.CDK_STACK_DEPTH - 1) {
+        if ((current instanceof __1.DiagramComponent) && current.tags.get(__1.ComponentTags.isCdkStack) == "true") {
             try {
-                const stackRootComponent = current.treeAncestorInDepth(AwsDiagramGenerator.CDK_STACK_DEPTH - 1);
+                const stackRootComponent = current.treeAncestorWithTag(__1.ComponentTags.isCdkStack, "true");
                 current.links.getLinkedComponents().forEach(linkedComponent => {
                     if (!stackRootComponent.componentIsInSubTree(linkedComponent)) {
                         current.links.removeLink(linkedComponent);
                         if (linkedComponent instanceof __1.DiagramComponent) {
-                            stackRootComponent.links.addLink(linkedComponent.treeAncestorInDepth(AwsDiagramGenerator.CDK_STACK_DEPTH - 1));
+                            stackRootComponent.links.addLink(linkedComponent.treeAncestorWithTag(__1.ComponentTags.isCdkStack, "true"));
                         }
                     }
                 });
@@ -224,8 +246,6 @@ class AwsDiagramGenerator extends __1.DiagramGenerator {
     }
 }
 exports.AwsDiagramGenerator = AwsDiagramGenerator;
-AwsDiagramGenerator.CDK_STACK_DEPTH = 2;
-AwsDiagramGenerator.NON_DIAGRAMED_ID_PREFIXES = ["SsmParameterValue"];
 AwsDiagramGenerator.sanitizeComponentId = (path) => path.replace(RegExp(":", "g"), "_");
 AwsDiagramGenerator.cleanLabel = (label) => {
     if (label.length > 1 && label[label.length - 1] == "Resource")

package/dist/src/diagram/aws/aws-diagram-generator.js.map

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

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

@@ -59,7 +59,8 @@ class AwsEdgeResolver {
         });
     }
     findUniqueResourceId(component) {
-        const pathParts = component.idPathParts().slice(aws_diagram_generator_1.AwsDiagramGenerator.CDK_STACK_DEPTH - 1);
+        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);

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":";;;;;;;;;;;;;;;;;;;;;;AAEA,0CAA2B;AAC3B,iEAA+D;AAC/D,sDAA+D;AAC/D,mEAA2D;AAM3D,MAAa,eAAe;IAExB,YAAY,CAAC,IAAc,EAAE,OAAgB;QAEzC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAE5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,QAAQ,CAAC,IAAc,EAAE,OAAgB;QAE7C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,2CAAmB,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACjH,IAAI,eAAe,IAAI,IAAI,EAAE;YAEzB,OAAM;SACT;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAEhD,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,eAAmC,CAAC,CAAC,CAAA;IAC9G,CAAC;IAEO,OAAO,CAAC,YAAoB,EAAE,eAAiC;QAEnE,MAAM,YAAY,GAAG,eAAe,CAAC,mBAAmB,CAAC,yBAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAE1F,IAAI,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAE1E,IAAI,eAAe,IAAI,IAAI,EAAE;YACzB,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;SACjD;IACL,CAAC;IAGO,mBAAmB,CAAC,YAAY,EAAE,YAAoB;QAG1D,MAAM,YAAY,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC,SAAoB,EAAE,EAAE;YAC5E,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;YAC7D,OAAO,YAAY,KAAK,gBAAgB,CAAA;QAC5C,CAAC,CAAC,CAAA;QAEF,IAAI,YAAY,IAAI,IAAI;YACpB,OAAO,YAAY,CAAA;QAGvB,OAAO,YAAY,CAAC,oBAAoB,CAAC,CAAC,SAAoB,EAAE,EAAE;YAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;YAC7D,OAAO,YAAY,CAAC,WAAW,EAAE,KAAK,gBAAgB,CAAA;QAC1D,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB,CAAC,SAAoB;QAE7C,MAAM,UAAU,GAAG,SAAS,CAAC,mBAAmB,CAAC,yBAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAClF,MAAM,SAAS,GAAa,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAA;QAE7E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAA;QAExC,OAAO,uBAAY,CAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAKO,WAAW,CAAC,IAAc;QAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QACjE,IAAI,KAAK,IAAI,SAAS;YAClB,OAAO,KAAK,EAAU,CAAA;QAE1B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAe,CAAC,CAAC,CAAA;QAE3E,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,2CAAmB,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7E,CAAC;IAED,yBAAyB,CAAC,MAA+C;QAErE,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ;YAC7C,OAAO,IAAI,GAAG,EAAU,CAAA;QAE5B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;QAErC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;YACtB,IAAI,GAAG,KAAK,YAAY,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;gBACtD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBAChD,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACvB,CAAC,CACI,CAAA;aACJ;YACD,IAAI,GAAG,KAAK,KAAK,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,EAAE;gBACpD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CACtC,EAAE,CAAC,EAAE;oBACD,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACvB,CAAC,CACJ,CAAA;aACJ;YAED,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,GAAG,CAA4B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACpF,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAC3B,CAAC,CAAC,CAAA;SACL;QAED,OAAO,WAAW,CAAA;IACtB,CAAC;IAED,gBAAgB,CAAC,MAAW;QAExB,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE;YACzC,OAAO,IAAI,GAAG,EAAU,CAAA;SAC3B;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC5B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;YAC7B,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACf,OAAO,GAAG,CAAA;SAEb;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;YACF,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YAChC,OAAO,IAAI,GAAG,CAAS,OAAO,CAAC,CAAA;SAClC;QAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;QAErC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC5B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACtB,IAAI,GAAG,KAAK,YAAY,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;oBACtD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAClC;gBACD,IAAI,GAAG,KAAK,KAAK,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,EAAE;oBACpD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAW,CAAC,CAAA;iBACzC;gBAED,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,GAAG,CAA4B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACpF,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAC3B,CAAC,CAAC,CAAA;aACL;SACJ;QAED,OAAO,WAAW,CAAA;IACtB,CAAC;CAEJ;AArJD,0CAqJC"}