From 6f13ed6f46437fcc1b65f0ffdad1c54419af6522 Mon Sep 17 00:00:00 2001
From: Crphang <crphang@gmail.com>
Date: Sun, 8 Mar 2020 17:02:46 +0800
Subject: [PATCH] Add inline puml support

---
 docs/userGuide/puml.md                        |  35 ++++--
 package-lock.json                             |  46 +++-----
 package.json                                  |   1 +
 .../default/markbind-plugin-plantuml.js       | 108 ++++++++----------
 src/util/pluginUtil.js                        |  51 +++++++++
 .../9c9e77fc0a983cb6b592e65733787bec.png      | Bin 0 -> 6864 bytes
 test/functional/test_site/expected/index.html |   6 +
 .../test_site/expected/inline-output.png      | Bin 0 -> 9392 bytes
 .../test_site/expected/testPlantUML.html      |   6 +
 test/functional/test_site/testPlantUML.md     |  36 ++++++
 10 files changed, 190 insertions(+), 99 deletions(-)
 create mode 100644 src/util/pluginUtil.js
 create mode 100644 test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png
 create mode 100644 test/functional/test_site/expected/inline-output.png

diff --git a/docs/userGuide/puml.md b/docs/userGuide/puml.md
index d46a132c3f..6bd174ca3b 100644
--- a/docs/userGuide/puml.md
+++ b/docs/userGuide/puml.md
@@ -30,19 +30,27 @@ A PlantUML diagram file (.puml) can be inserted into a Markbind page using a `<p
 the same attributes as the `<pic>` tag, listed below:
 
 ****Options****
-Name | Type | Default | Description 
---- | --- | --- | ---
-alt | `string` | | **This must be specified.**<br>The alternative text of the diagram.
-height | `string` | | The height of the diagram in pixels.
-src | `string` | | **This must be specified.**<br>The URL of the diagram.<br>The URL can be specified as absolute or relative references. More info in: _[Intra-Site Links]({{baseUrl}}/userGuide/formattingContents.html#intraSiteLinks)_
-width | `string` | | The width of the diagram in pixels.<br>If both width and height are specified, width takes priority over height. It is to maintain the diagram's aspect ratio.
+Name | Type | Description
+--- | --- | ---
+alt | `string` | **This must be specified.**<br>The alternative text of the diagram.
+height | `string` | The height of the diagram in pixels.
+name | `string` | The name of the output file.
+src | `string` | The URL of the diagram if your PUML input is in another file.<br>The URL can be specified as absolute or relative references. More info in: _[Intra-Site Links]({{baseUrl}}/userGuide/formattingContents.html#intraSiteLinks)_
+width | `string` | The width of the diagram in pixels.<br>If both width and height are specified, width takes priority over height. It is to maintain the diagram's aspect ratio.
 
 
 ### Example
 
+You could have your PUML be written in a separate file or inline.
+
 <include src="outputBox.md" boilerplate>
 <span id="code">
 
+_Markbind page separate file_:
+```
+<puml src="diagrams/sequence.puml" width=300 />
+```
+
 _diagrams/sequence.puml_:
 ```
 @startuml
@@ -57,9 +65,20 @@ return success
 @enduml
 ```
 
-_Markbind page_:
+_Markbind page inline_:
 ```
-<puml src="diagrams/sequence.puml" width=300/>
+<puml width=300>
+@startuml
+alice -> bob ++ : hello
+bob -> bob ++ : self call
+bob -> bib ++  #005500 : hello
+bob -> george ** : create
+return done
+return rc
+bob -> george !! : delete
+return success
+@enduml
+</puml>
 ```
 
 </span>
diff --git a/package-lock.json b/package-lock.json
index 27d5346e83..5007394897 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1941,6 +1941,11 @@
         "which": "^1.2.9"
       }
     },
+    "crypto-js": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz",
+      "integrity": "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="
+    },
     "css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
@@ -3226,8 +3231,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3245,13 +3249,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3264,18 +3266,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3378,8 +3377,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3389,7 +3387,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3402,20 +3399,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3432,7 +3426,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3505,8 +3498,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3516,7 +3508,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3592,8 +3583,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3623,7 +3613,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3641,7 +3630,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3680,13 +3668,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
diff --git a/package.json b/package.json
index 3df1a0b18a..926794d6cb 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "cheerio": "^0.22.0",
     "chokidar": "^3.3.0",
     "commander": "^3.0.2",
+    "crypto-js": "^4.0.0",
     "fastmatter": "^2.1.1",
     "figlet": "^1.2.4",
     "find-up": "^4.1.0",
diff --git a/src/plugins/default/markbind-plugin-plantuml.js b/src/plugins/default/markbind-plugin-plantuml.js
index a7d87b7a1f..4862a991e1 100644
--- a/src/plugins/default/markbind-plugin-plantuml.js
+++ b/src/plugins/default/markbind-plugin-plantuml.js
@@ -6,42 +6,35 @@
 const cheerio = module.parent.require('cheerio');
 const fs = require('fs');
 const path = require('path');
+
 const { exec } = require('child_process');
 const logger = require('../../util/logger');
+const pluginUtil = require('../../util/pluginUtil');
 
 const JAR_PATH = path.resolve(__dirname, 'plantuml.jar');
 
 const {
   ERR_PROCESSING,
-  ERR_READING,
 } = require('../../constants');
 
 // Tracks diagrams that have already been processed
 const processedDiagrams = new Set();
 
 /**
- * Generates diagram and replaces src attribute of puml tag
- * @param src src attribute of the puml tag
- * @param cwf original file that contains the puml tag, we resolve relative src to this file
+ * Generates diagram and returns the file name of the diagram
+ * @param fileName name of the file to be generated
+ * @param content puml dsl used to generate the puml diagram
  * @param config sourcePath and resultPath from parser context
- * @returns {string} resolved src attribute
+ * @returns {string} file name of diagram
  */
-function generateDiagram(src, cwf, config) {
-  const { sourcePath, resultPath } = config;
-  const _cwf = cwf || sourcePath;
+function generateDiagram(fileName, content, config) {
+  const { resultPath } = config;
 
-  // For replacing img.src
-  const diagramSrc = src.replace('.puml', '.png');
+  const outputDir = path.join(path.dirname(resultPath), path.dirname(fileName));
   // Path of the .puml file
-  const rawDiagramPath = path.resolve(path.dirname(_cwf), src);
-  // Path of the .png to be generated
-  const outputFilePath = path.resolve(resultPath, path.relative(sourcePath, rawDiagramPath)
-    .replace('.puml', '.png'));
-  // Output dir for the png file
-  const outputDir = path.dirname(outputFilePath);
-
+  const outputFilePath = path.join(outputDir, path.basename(fileName));
   // Tracks built files to avoid accessing twice
-  if (processedDiagrams.has(outputFilePath)) { return diagramSrc; }
+  if (processedDiagrams.has(outputFilePath)) { return fileName; }
   processedDiagrams.add(outputFilePath);
 
   // Creates output dir if it doesn't exist
@@ -49,49 +42,37 @@ function generateDiagram(src, cwf, config) {
     fs.mkdirSync(outputDir, { recursive: true });
   }
 
-  // Read diagram file, launch PlantUML jar
-  fs.readFile(rawDiagramPath, (err, data) => {
-    if (err) {
-      logger.debug(err);
-      logger.error(`${ERR_READING} ${rawDiagramPath}`);
-      return;
-    }
-
-    const umlCode = data.toString();
-
-    // Java command to launch PlantUML jar
-    const cmd = `java -jar "${JAR_PATH}" -pipe > "${outputFilePath}"`;
-    const childProcess = exec(cmd);
-
-    let errorLog = '';
-
-    childProcess.stdin.write(
-      umlCode,
-      (e) => {
-        if (e) {
-          logger.debug(e);
-          logger.error(`${ERR_PROCESSING} ${rawDiagramPath}`);
-        }
-        childProcess.stdin.end();
-      },
-    );
-
-    childProcess.on('error', (error) => {
-      logger.debug(error);
-      logger.error(`${ERR_PROCESSING} ${rawDiagramPath}`);
-    });
+  // Java command to launch PlantUML jar
+  const cmd = `java -jar "${JAR_PATH}" -pipe > "${outputFilePath}"`;
+  const childProcess = exec(cmd);
+
+  let errorLog = '';
+  childProcess.stdin.write(
+    content,
+    (e) => {
+      if (e) {
+        logger.debug(e);
+        logger.error(`${ERR_PROCESSING} ${fileName}`);
+      }
+      childProcess.stdin.end();
+    },
+  );
+
+  childProcess.on('error', (error) => {
+    logger.debug(error);
+    logger.error(`${ERR_PROCESSING} ${fileName}`);
+  });
 
-    childProcess.stderr.on('data', (errorMsg) => {
-      errorLog += errorMsg;
-    });
+  childProcess.stderr.on('data', (errorMsg) => {
+    errorLog += errorMsg;
+  });
 
-    childProcess.on('exit', () => {
-      // This goes to the log file, but not shown on the console
-      logger.debug(errorLog);
-    });
+  childProcess.on('exit', () => {
+    // This goes to the log file, but not shown on the console
+    logger.debug(errorLog);
   });
 
-  return diagramSrc;
+  return fileName;
 }
 
 module.exports = {
@@ -101,11 +82,14 @@ module.exports = {
     // Processes all <puml> tags
     const $ = cheerio.load(content, { xmlMode: true });
     $('puml').each((i, tag) => {
-      // eslint-disable-next-line no-param-reassign
       tag.name = 'pic';
-      const { src, cwf } = tag.attribs;
-      // eslint-disable-next-line no-param-reassign
-      tag.attribs.src = generateDiagram(src, cwf, config);
+      const { cwf } = tag.attribs;
+      const pumlContent = pluginUtil.getPluginContent($, tag, cwf);
+
+      const filePath = pluginUtil.getFilePathForPlugin(tag.attribs, pumlContent);
+
+      tag.attribs.src = generateDiagram(filePath, pumlContent, config);
+      tag.children = [];
     });
 
     return $.html();
@@ -113,4 +97,6 @@ module.exports = {
   getSources: () => ({
     tagMap: [['puml', 'src']],
   }),
+
+  getSpecialTags: () => ['puml'],
 };
diff --git a/src/util/pluginUtil.js b/src/util/pluginUtil.js
new file mode 100644
index 0000000000..15003674d0
--- /dev/null
+++ b/src/util/pluginUtil.js
@@ -0,0 +1,51 @@
+const cryptoJS = require('crypto-js');
+const fs = require('fs');
+const path = require('path');
+const fsUtil = require('./fsUtil');
+const logger = require('./logger');
+
+const {
+  ERR_READING,
+} = require('../constants');
+
+const pluginUtil = {
+  /**
+   * Returns the file path for the plugin tag.
+   * Return based on given name if provided, or it will be based on src.
+   * If both are not provided, a md5 generated hash is provided for consistency.
+   */
+  getFilePathForPlugin: (tagAttribs, content) => {
+    if (tagAttribs.name !== undefined) {
+      return `${fsUtil.removeExtension(tagAttribs.name)}.png`;
+    }
+
+    if (tagAttribs.src !== undefined) {
+      const filePath = fsUtil.removeExtension(tagAttribs.src);
+      return `${filePath}.png`;
+    }
+
+    const hashedContent = cryptoJS.MD5(content).toString();
+    return `${hashedContent}.png`;
+  },
+
+  /**
+   * Returns the string content of the plugin.
+   */
+  getPluginContent: ($, element, cwf) => {
+    if (element.attribs.src !== undefined) {
+      // Path of the plugin content
+      const rawPath = path.resolve(path.dirname(cwf), element.attribs.src);
+      try {
+        return fs.readFileSync(rawPath, 'utf8');
+      } catch (err) {
+        logger.debug(err);
+        logger.error(`${ERR_READING} ${rawPath}`);
+        return '';
+      }
+    }
+
+    return $(element).text();
+  },
+};
+
+module.exports = pluginUtil;
diff --git a/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png b/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff4fd1ece9544d223806ef349840697840fd0b91
GIT binary patch
literal 6864
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

literal 0
HcmV?d00001

diff --git a/test/functional/test_site/expected/index.html b/test/functional/test_site/expected/index.html
index f8b5285162..355c44413e 100644
--- a/test/functional/test_site/expected/index.html
+++ b/test/functional/test_site/expected/index.html
@@ -497,6 +497,12 @@ <h1 id="markbind-plugin-pre-render">Markbind Plugin Pre-render<a class="fa fa-an
         <p><strong>Test PlantUML live reload with include</strong></p>
         <div>
           <p><strong>PlantUML Test</strong></p>
+          <p>
+            <pic name="inline-output" src="/test_site/inline-output.png"></pic>
+          </p>
+          <p>
+            <pic src="/test_site/9c9e77fc0a983cb6b592e65733787bec.png"></pic>
+          </p>
           <p><strong>Sequence Diagram</strong>
             <pic src="/test_site/diagrams/sequence.png"></pic>
           </p>
diff --git a/test/functional/test_site/expected/inline-output.png b/test/functional/test_site/expected/inline-output.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0834af42cb6c75e17ea136a645a4ee42955a4f7
GIT binary patch
literal 9392
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
Kt&Uc;4*ws7+74C#

literal 0
HcmV?d00001

diff --git a/test/functional/test_site/expected/testPlantUML.html b/test/functional/test_site/expected/testPlantUML.html
index e359c22e9b..8c273c7987 100644
--- a/test/functional/test_site/expected/testPlantUML.html
+++ b/test/functional/test_site/expected/testPlantUML.html
@@ -26,6 +26,12 @@
     <div id="flex-body">
       <div id="content-wrapper">
         <p><strong>PlantUML Test</strong></p>
+        <p>
+          <pic name="inline-output" src="/test_site/inline-output.png"></pic>
+        </p>
+        <p>
+          <pic src="/test_site/9c9e77fc0a983cb6b592e65733787bec.png"></pic>
+        </p>
         <p><strong>Sequence Diagram</strong>
           <pic src="/test_site/diagrams/sequence.png"></pic>
         </p>
diff --git a/test/functional/test_site/testPlantUML.md b/test/functional/test_site/testPlantUML.md
index a407b745a9..ac8ca67531 100644
--- a/test/functional/test_site/testPlantUML.md
+++ b/test/functional/test_site/testPlantUML.md
@@ -1,5 +1,41 @@
 **PlantUML Test**
 
+<puml name="inline-output">
+
+@startuml
+alice -> bob ++ : hello
+bob -> bob ++ : self call
+bob -> bib ++  #005500 : hello
+bob -> george ** : create
+return done
+return rc
+bob -> george !! : delete
+return success
+@enduml
+</puml>
+
+<puml>
+
+@startuml
+object Object01
+object Object02
+object Object03
+object Object04
+object Object05
+object Object06
+object Object07
+object Object08
+object user {
+  name = "Dummy"
+  id = 123
+}
+Object01 <|-- Object02
+Object03 *-- Object04
+Object05 o-- "4" Object06
+Object07 .. Object08 : some labels
+@enduml
+</puml>
+
 **Sequence Diagram**
 <puml src="diagrams/sequence.puml" />