cdk-dia 0.6.1 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/src/diagram/aws/stack-exports-container.js +8 -3
- package/dist/src/diagram/aws/stack-exports-container.js.map +1 -1
- package/dist/src/render/cytoscape/cytoscape.d.ts +0 -1
- package/dist/src/render/cytoscape/cytoscape.js +3 -14
- package/dist/src/render/cytoscape/cytoscape.js.map +1 -1
- package/dist/src/render/cytoscape/tests/generator.test.js +1 -1
- package/dist/src/render/cytoscape/tests/generator.test.js.map +1 -1
- package/package.json +10 -13
package/README.md
CHANGED
|
@@ -15,9 +15,14 @@ class StackExportsContainer {
|
|
|
15
15
|
static fromComponent(exportsComponent) {
|
|
16
16
|
const container = new StackExportsContainer();
|
|
17
17
|
exportsComponent.children.forEach(exportNode => {
|
|
18
|
-
const
|
|
19
|
-
if (
|
|
20
|
-
const refTargetId =
|
|
18
|
+
const refMatches = exportNode.id.match(new RegExp('Output{"Ref":"(.*)"}'));
|
|
19
|
+
if (refMatches) {
|
|
20
|
+
const refTargetId = refMatches[1];
|
|
21
|
+
container.exports.push(new StackExport(refTargetId, exportNode.id));
|
|
22
|
+
}
|
|
23
|
+
const getAttMatches = exportNode.id.match(new RegExp('Output{"Fn::GetAtt":\\["(.*)",".*"\\]}'));
|
|
24
|
+
if (getAttMatches) {
|
|
25
|
+
const refTargetId = getAttMatches[1];
|
|
21
26
|
container.exports.push(new StackExport(refTargetId, exportNode.id));
|
|
22
27
|
}
|
|
23
28
|
});
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,KAAK,CAAE,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAA;YAC3E,IAAI,UAAU,EAAC;gBACX,MAAM,WAAW,GAAW,UAAU,CAAC,CAAC,CAAC,CAAA;gBACzC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;aACtE;YAED,MAAM,aAAa,GAAG,UAAU,CAAC,EAAE,CAAC,KAAK,CAAE,IAAI,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAA;YAChG,IAAI,aAAa,EAAC;gBACd,MAAM,WAAW,GAAW,aAAa,CAAC,CAAC,CAAC,CAAA;gBAC5C,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;AAnCD,sDAmCC"}
|
|
@@ -27,8 +27,7 @@ const fs = __importStar(require("fs"));
|
|
|
27
27
|
const chalk_1 = __importDefault(require("chalk"));
|
|
28
28
|
const path_1 = __importStar(require("path"));
|
|
29
29
|
const cytoscape_generator_1 = require("./cytoscape-generator");
|
|
30
|
-
const
|
|
31
|
-
ncp.limit = 8;
|
|
30
|
+
const fs_extra = __importStar(require("fs-extra"));
|
|
32
31
|
class CytoscapeJsOutput {
|
|
33
32
|
constructor(staticFolderName, staticSiteFullPath) {
|
|
34
33
|
this.staticFolderName = staticFolderName;
|
|
@@ -54,22 +53,12 @@ class Cytoscape {
|
|
|
54
53
|
return new CytoscapeJsOutput(path_1.default.basename(basePath), path_1.default.resolve(basePath));
|
|
55
54
|
}
|
|
56
55
|
async renderToCytoscape(dia, targetFolder, iconsPath) {
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
fs_extra.copySync(__dirname + '/base', targetFolder);
|
|
57
|
+
fs_extra.copySync(iconsPath + '/icons', targetFolder + '/icons');
|
|
59
58
|
const [cyElements, cyStyles] = cytoscape_generator_1.CytoscapeGenerator.generate(dia);
|
|
60
59
|
fs.writeFileSync(`${targetFolder}/cy-elements.json`, JSON.stringify(cyElements));
|
|
61
60
|
fs.writeFileSync(`${targetFolder}/cy-styles.json`, JSON.stringify(cyStyles));
|
|
62
61
|
}
|
|
63
|
-
copyFolder(src, dst) {
|
|
64
|
-
return new Promise((resolve, reject) => {
|
|
65
|
-
ncp(src, dst, function (err) {
|
|
66
|
-
if (err) {
|
|
67
|
-
reject(err);
|
|
68
|
-
}
|
|
69
|
-
resolve(undefined);
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
62
|
}
|
|
74
63
|
exports.Cytoscape = Cytoscape;
|
|
75
64
|
//# sourceMappingURL=cytoscape.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cytoscape.js","sourceRoot":"","sources":["../../../../src/render/cytoscape/cytoscape.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,kDAAyB;AACzB,6CAAkC;AAGlC,+DAAwD;
|
|
1
|
+
{"version":3,"file":"cytoscape.js","sourceRoot":"","sources":["../../../../src/render/cytoscape/cytoscape.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,kDAAyB;AACzB,6CAAkC;AAGlC,+DAAwD;AACxD,mDAAqC;AAErC,MAAa,iBAAiB;IAC1B,YAAoB,gBAAwB,EAAU,kBAA0B;QAA5D,qBAAgB,GAAhB,gBAAgB,CAAQ;QAAU,uBAAkB,GAAlB,kBAAkB,CAAQ;IAAG,CAAC;IAEpF,UAAU;QACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAA;QACzG,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,gBAAgB,uCAAuC,CAAC,CAAC,CAAA;IACtH,CAAC;CACJ;AAPD,8CAOC;AAOD,MAAa,SAAS;IAElB,KAAK,CAAC,MAAM,CAAC,KAAqB;QAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAEpD,IAAI,SAAiB,CAAA;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAC;YAC3B,SAAS,GAAG,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;aAAM;YACH,SAAS,GAAG,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAA;SACnD;QAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;QAChE,OAAO,IAAI,iBAAiB,CAAC,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAClF,CAAC;IAKO,KAAK,CAAC,iBAAiB,CAAC,GAAoB,EAAE,YAAoB,EAAE,SAAiB;QAGzF,QAAQ,CAAC,QAAQ,CAAC,SAAS,GAAG,OAAO,EAAE,YAAY,CAAC,CAAA;QAEpD,QAAQ,CAAC,QAAQ,CAAC,SAAS,GAAG,QAAQ,EAAG,YAAY,GAAE,QAAQ,CAAC,CAAA;QAGhE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,wCAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QAC/D,EAAE,CAAC,aAAa,CAAC,GAAG,YAAY,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;QAChF,EAAE,CAAC,aAAa,CAAC,GAAG,YAAY,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;IAChF,CAAC;CAEJ;AAhCD,8BAgCC"}
|
|
@@ -43,7 +43,7 @@ describe('Cytoscape static website generated as expected', () => {
|
|
|
43
43
|
expect(JSON.parse(elementsJson.body).length).toBeGreaterThanOrEqual(2);
|
|
44
44
|
const stylesJson = new File(`${filePath}/cy-styles.json`);
|
|
45
45
|
expect(JSON.parse(stylesJson.body).length).toBeGreaterThanOrEqual(15);
|
|
46
|
-
}
|
|
46
|
+
});
|
|
47
47
|
});
|
|
48
48
|
class File {
|
|
49
49
|
constructor(path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.test.js","sourceRoot":"","sources":["../../../../../src/render/cytoscape/tests/generator.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,gEAA0D;AAC1D,0EAAkE;AAClE,4CAAsC;AAGtC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAA;AAElD,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;IAE5D,EAAE,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAE7C,MAAM,OAAO,GAAG,IAAA,6BAAY,EAAC,QAAQ,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,YAAY,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAA;QAEtE,MAAM,IAAI,qBAAS,EAAE,CAAC,MAAM,CAAC;YACzB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,aAAa,CAAC,CAAA;QAChD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAA;QACpD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAEvC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,QAAQ,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,EAAE,CAAA;QAE9C,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,EAAE,CAAA;QAE3C,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,mBAAmB,CAAC,CAAA;QAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAA;QAEtE,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAA;QACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;IACzE,CAAC,
|
|
1
|
+
{"version":3,"file":"generator.test.js","sourceRoot":"","sources":["../../../../../src/render/cytoscape/tests/generator.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,gEAA0D;AAC1D,0EAAkE;AAClE,4CAAsC;AAGtC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAA;AAElD,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;IAE5D,EAAE,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAE7C,MAAM,OAAO,GAAG,IAAA,6BAAY,EAAC,QAAQ,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,YAAY,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAA;QAEtE,MAAM,IAAI,qBAAS,EAAE,CAAC,MAAM,CAAC;YACzB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,aAAa,CAAC,CAAA;QAChD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAA;QACpD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAEvC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,QAAQ,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,EAAE,CAAA;QAE9C,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,EAAE,CAAA;QAE3C,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,mBAAmB,CAAC,CAAA;QAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAA;QAEtE,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAA;QACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,MAAM,IAAI;IAIN,YAAY,IAAY;QACpB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAE9B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAA;SAC/C;IACL,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cdk-dia",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "🎡 Automated diagrams of CDK provisioned infrastructure",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build-watch": "tsc --watch",
|
|
@@ -11,9 +11,6 @@
|
|
|
11
11
|
"bin": {
|
|
12
12
|
"cdk-dia": "dist/bin/cli.js"
|
|
13
13
|
},
|
|
14
|
-
"jest": {
|
|
15
|
-
"testEnvironment": "node"
|
|
16
|
-
},
|
|
17
14
|
"main": "dist/index.js",
|
|
18
15
|
"types": "dist/index.d.ts",
|
|
19
16
|
"files": [
|
|
@@ -23,18 +20,18 @@
|
|
|
23
20
|
"author": "Tom Roshko @pistazie",
|
|
24
21
|
"license": "MIT",
|
|
25
22
|
"dependencies": {
|
|
26
|
-
"
|
|
23
|
+
"@aws-cdk/core": "^1.40.0",
|
|
27
24
|
"chalk": "^4.1.0",
|
|
28
25
|
"colors": "^1.4.0",
|
|
26
|
+
"fs-extra": "^10.0.1",
|
|
29
27
|
"hasbin": "^1.2.3",
|
|
30
|
-
"
|
|
28
|
+
"lodash": "^4.17.20",
|
|
31
29
|
"sanitize-filename": "^1.6.3",
|
|
32
30
|
"terminal-link": "^2.1.1",
|
|
33
31
|
"ts-graphviz": "^0.13.2",
|
|
34
32
|
"values.js": "^2.0.0",
|
|
35
33
|
"word-wrap": "^1.2.3",
|
|
36
|
-
"yargs": "^16.2.0"
|
|
37
|
-
"@aws-cdk/core": "^1.40.0"
|
|
34
|
+
"yargs": "^16.2.0"
|
|
38
35
|
},
|
|
39
36
|
"devDependencies": {
|
|
40
37
|
"@aws-cdk/core": "^1.40.0",
|
|
@@ -42,7 +39,7 @@
|
|
|
42
39
|
"@babel/preset-typescript": "^7.12.7",
|
|
43
40
|
"@types/glob": "^7.1.3",
|
|
44
41
|
"@types/hasbin": "^1.2.0",
|
|
45
|
-
"@types/jest": "^
|
|
42
|
+
"@types/jest": "^27.4.0",
|
|
46
43
|
"@types/jest-specific-snapshot": "^0.5.5",
|
|
47
44
|
"@types/lodash": "^4.14.165",
|
|
48
45
|
"@types/node": "^10.12.18",
|
|
@@ -53,12 +50,12 @@
|
|
|
53
50
|
"eslint": "^7.18.0",
|
|
54
51
|
"fast-glob": "^3.2.5",
|
|
55
52
|
"glob": "^7.1.6",
|
|
56
|
-
"jest": "^
|
|
53
|
+
"jest": "^27.5.1",
|
|
57
54
|
"jest-file-snapshot": "^0.5.0",
|
|
58
|
-
"jest-junit": "^
|
|
59
|
-
"jest-specific-snapshot": "^
|
|
55
|
+
"jest-junit": "^13.0.0",
|
|
56
|
+
"jest-specific-snapshot": "^5.0.0",
|
|
60
57
|
"rimraf": "^3.0.2",
|
|
61
|
-
"ts-jest": "^
|
|
58
|
+
"ts-jest": "^27.1.4",
|
|
62
59
|
"ts-node": "^9.0.0",
|
|
63
60
|
"typescript": "^4.1.3"
|
|
64
61
|
},
|