convertRelativePathsToAbsolute upon request

sponbergbadger · Feb 9, 2020 · b3e88ee · b3e88ee
1 parent 3d26291
commit b3e88ee
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/lib/SvgDiagramFactory.js b/lib/SvgDiagramFactory.js
@@ -19,6 +19,7 @@ module.exports = class SvgDiagramFactory {
   constructor(basePath, pluginPathArray) {
     this.basePath = basePath
     this.parsersProducersRenderers = new ParsersProducersRenderers([...builtinPaths, ...pluginPathArray])
+    this.convertRelativePathsToAbsolute = false
   }
 
   getParsers() {

diff --git a/lib/SvgDiagramRenderer.js b/lib/SvgDiagramRenderer.js
@@ -14,7 +14,8 @@ module.exports = class SvgDiagramRenderer {
     this.diagramFactory = diagramFactory
     this.context = {
       basePath: diagramFactory.basePath,
-      renderers: diagramFactory.getRenderers()
+      renderers: diagramFactory.getRenderers(),
+      convertRelativeToAbsolute: diagramFactory.convertRelativePathsToAbsolute,
     }
   }
 
@@ -85,7 +86,7 @@ function renderFonts(fonts, context, outputPath) {
         buf += `@import url("${i.trim()}");`
       }
     } else {
-      const url = Util.relativeAbsoluteOrRemoteUrl(font.src, context.basePath, outputPath)
+      const url = Util.relativeAbsoluteOrRemoteUrl(font.src, context.basePath, outputPath, context.convertRelativeToAbsolute)
       buf += '@font-face {'
       buf += ` font-family: '${font.family}';`
       buf += ` src: url('${url}');`

diff --git a/lib/Util.js b/lib/Util.js
@@ -166,7 +166,7 @@ module.exports = {
     }
   },
 
-  relativeAbsoluteOrRemoteUrl(url, basePath, outputPath) {
+  relativeAbsoluteOrRemoteUrl(url, basePath, outputPath, convertRelativeToAbsolute = false) {
     if (!url.startsWith('http://')
         && !url.startsWith('https://')
         && !url.startsWith('/')) {
@@ -178,7 +178,11 @@ module.exports = {
       } else {
         outputPath = path.dirname(outputPath);
       }
-      url = path.relative(outputPath, absoluteUrl)
+      if (convertRelativeToAbsolute) {
+        url = absoluteUrl
+      } else {
+        url = path.relative(outputPath, absoluteUrl)
+      }
     }
     return url
   },

diff --git a/lib/builtins/Renderers.js b/lib/builtins/Renderers.js
@@ -123,7 +123,7 @@ function renderImage(obj, sizeAndPosition, styleBlock, svgBlock, context, styleD
   const x1 = cx - obj.width / 2
   const y1 = cy - obj.height / 2
 
-  const url = Util.relativeAbsoluteOrRemoteUrl(obj.url, context.basePath, outputPath)
+  const url = Util.relativeAbsoluteOrRemoteUrl(obj.url, context.basePath, outputPath, context.convertRelativeToAbsolute)
   return `<image x="${round(x1)}" y="${round(y1)}" width="${round(width)}" height="${round(height)}" href="${url}"${styleBlock}${svgBlock}></image>`
 }
 

diff --git a/test/SvgDiagramFactory.test.js b/test/SvgDiagramFactory.test.js
@@ -49,3 +49,28 @@ test('it should resolve absolute file paths', () => {
   expect(fs.existsSync(outputPath)).toBeTruthy()
   expect(svg.g.image._attributes.href).toBe('../images/image.svg')
 })
+
+test('it should output absolute paths upon request', () => {
+  const basePath = path.resolve(__dirname, 'assets')
+  const pluginPaths = [path.resolve(__dirname, 'assets/js/Plugins.js')]
+  const filename = 'diagram19'
+
+  const outputPath = path.resolve(basePath, 'output', filename + '.svg')
+  if (fs.existsSync(outputPath)) {
+    fs.unlinkSync(outputPath)
+  }
+
+  const diagramFactory = new SvgDiagramFactory(basePath, pluginPaths)
+  diagramFactory.convertRelativePathsToAbsolute = true
+
+  const input = path.resolve(basePath, filename + '.txt')
+  const output = path.resolve(basePath, 'output', filename + '.svg')
+
+  const xml = diagramFactory.renderDiagram(input, output)
+  const svg = XmlJS.xml2js(xml, {compact: true}).svg
+
+  const absoluteImagePath = path.resolve(__dirname, 'assets', 'images', 'image.svg')
+
+  expect(fs.existsSync(outputPath)).toBeTruthy()
+  expect(svg.g.image._attributes.href).toBe(absoluteImagePath)
+})