resolves #201 resolve relative PlantUML includes from the diagram dir…

…ectory
asciidoctor · Feb 14, 2021 · 2d2622d · 2d2622d
1 parent a87b2d5
commit 2d2622d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/asciidoctor-kroki.js b/src/asciidoctor-kroki.js
@@ -77,7 +77,7 @@ const processKroki = (processor, parent, attrs, diagramType, diagramText, contex
       if (plantUmlInclude) {
         diagramText = `!include ${plantUmlInclude}\n${diagramText}`
       }
-      diagramText = require('./preprocess.js').preprocessPlantUML(diagramText, context, doc.getBaseDir())
+      diagramText = require('./preprocess.js').preprocessPlantUML(diagramText, context, diagramDir)
     }
   }
   const blockId = attrs.id

diff --git a/src/preprocess.js b/src/preprocess.js
@@ -83,13 +83,13 @@ function removePlantUmlTags (diagramText) {
 /**
  * @param {string} diagramText
  * @param {any} context
- * @param {string} baseDir - base directory
+ * @param {string} diagramDir - diagram base directory
  * @returns {string}
  */
-module.exports.preprocessPlantUML = function (diagramText, context, baseDir = '.') {
+module.exports.preprocessPlantUML = function (diagramText, context, diagramDir = '.') {
   const includeOnce = []
   const includeStack = []
-  diagramText = preprocessPlantUmlIncludes(diagramText, baseDir, includeOnce, includeStack, context.vfs)
+  diagramText = preprocessPlantUmlIncludes(diagramText, diagramDir, includeOnce, includeStack, context.vfs)
   return removePlantUmlTags(diagramText)
 }
 

diff --git a/test/fixtures/docs/diagrams/hello.puml b/test/fixtures/docs/diagrams/hello.puml
@@ -0,0 +1,3 @@
+!include ./style.puml
+
+Bob->Alice: Hello
diff --git a/test/fixtures/docs/diagrams/style.puml b/test/fixtures/docs/diagrams/style.puml
@@ -0,0 +1 @@
+skinparam monochrome true
diff --git a/test/fixtures/docs/hello.adoc b/test/fixtures/docs/hello.adoc
@@ -0,0 +1 @@
+plantuml::diagrams/hello.puml[]
diff --git a/test/preprocess.spec.js b/test/preprocess.spec.js
@@ -13,6 +13,9 @@ const url = require('url')
 
 chai.use(dirtyChai)
 
+const asciidoctorKroki = require('../src/asciidoctor-kroki.js')
+const asciidoctor = require('@asciidoctor/core')()
+
 const { preprocessVegaLite } = require('../src/preprocess.js')
 
 describe('Vega-Lite preprocessing', () => {
@@ -520,4 +523,12 @@ skinparam BackgroundColor black
       here -> there`
     )
   })
+
+  it('should resolve PlantUML includes from the diagram directory', () => {
+    const registry = asciidoctor.Extensions.create()
+    asciidoctorKroki.register(registry)
+    const file = path.join(__dirname, 'fixtures', 'docs', 'hello.adoc')
+    const html = asciidoctor.convertFile(file, { safe: 'safe', extension_registry: registry, to_file: false })
+    expect(html).to.contain('https://kroki.io/plantuml/svg/eNorzs7MK0gsSsxVyM3Py0_OKMrPTVUoKSpN5eJyyk_StXPMyUxOtVLwSM3JyQcAc1EPvA==')
+  })
 })