release new version

README.md

@@ -1,6 +1,5 @@
 # Obsidian PlantUML
 
-![GitHub package.json version](https://img.shields.io/github/package-json/v/joethei/obsidian-plantuml)
 ![Maintenance](https://shields.joethei.xyz:/maintenance/yes/2022)
 ![GitHub manifest.json dynamic (path)](https://img.shields.io/github/manifest-json/minAppVersion/joethei/obsidian-plantuml?label=lowest%20supported%20app%20version)
 [![libera manifesto](https://img.shields.io/badge/libera-manifesto-lightgrey.svg)](https://liberamanifesto.com)
@@ -112,7 +111,7 @@ results in:
 
 ## Known issues
 Not all methods of using PlantUML support all different diagrams.
-Following are a few know issues.
+Following are a few known issues.
 - ASCII can only ever generate Sequence diagrams
 - The PicoWeb server does not support clickable links in png diagrams
 - Some languages like chinese are not rendered correctly -> Switch to SVG rendering

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-plantuml",
 	"name": "PlantUML",
-	"version": "1.6.3",
+	"version": "1.6.4",
 	"minAppVersion": "0.13.0",
 	"description": "Render PlantUML Diagrams",
 	"author": "Johannes Theiner",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plantuml",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "PlantUML rendering for Obsidian.md",
   "main": "main.js",
   "scripts": {

src/functions.ts

@@ -13,7 +13,7 @@ export class Replacer {
         this.plugin = plugin;
     }
 
-    replaceNonBreakingSpaces(text: string): string {
+    public replaceNonBreakingSpaces(text: string): string {
         const lines = text.split(/\r?\n/);
         const resultLines: string[] = [];
         if (text.startsWith("@startmindmap")) {
@@ -33,7 +33,7 @@ export class Replacer {
      * @param path path of the current file
      * @param filetype
      */
-    replaceLinks(text: string, path: string, filetype: string) : string {
+    public replaceLinks(text: string, path: string, filetype: string) : string {
         return text.replace(/\[\[\[([\s\S]*?)\]\]\]/g, ((_, args) => {
             const split = args.split("|");
             const file = this.plugin.app.metadataCache.getFirstLinkpathDest(split[0], path);
@@ -57,7 +57,7 @@ export class Replacer {
      * get the absolute path on the users computer
      * @param path vault local path
      */
-    private getFullPath(path: string) {
+    public getFullPath(path: string) {
         if (path.length === 0) {
             //@ts-ignore
             return this.plugin.app.vault.adapter.getFullPath("");
@@ -75,7 +75,7 @@ export class Replacer {
         return this.plugin.app.vault.adapter.getFullPath(folder.path);
     }
 
-    getPath(ctx: MarkdownPostProcessorContext) {
+    public getPath(ctx: MarkdownPostProcessorContext) {
         return this.getFullPath(ctx ? ctx.sourcePath : '');
     }
 

src/localProcessors.ts

@@ -33,7 +33,7 @@ export class LocalProcessors implements Processor {
 
     async generateLocalMap(source: string, path: string): Promise<string> {
         const {exec} = require('child_process');
-        const args = this.resolveLocalJarCmd(path).concat(['-pipemap']);
+        const args = this.resolveLocalJarCmd().concat(['-pipemap']);
         const child = exec(args.join(" "), {encoding: 'binary', cwd: path});
 
         let stdout = "";
@@ -66,7 +66,7 @@ export class LocalProcessors implements Processor {
 
     async generateLocalImage(source: string, type: OutputType, path: string): Promise<string> {
         const {ChildProcess, exec} = require('child_process');
-        const args = this.resolveLocalJarCmd(path).concat(['-t' + type, '-pipe']);
+        const args = this.resolveLocalJarCmd().concat(['-t' + type, '-pipe']);
 
         let child: typeof ChildProcess;
         if (type === OutputType.PNG) {
@@ -128,28 +128,29 @@ export class LocalProcessors implements Processor {
      * To support local jar settings with unix-like style, and search local jar file
      * from current vault path.
      */
-    private resolveLocalJarCmd(path: string): string[] {
+    private resolveLocalJarCmd(): string[] {
         const jarFromSettings = this.plugin.settings.localJar;
         const {isAbsolute, resolve} = require('path');
         const {userInfo} = require('os');
         let jarFullPath: string;
+        const path = this.plugin.replacer.getFullPath("");
 
         if (jarFromSettings[0] === '~') {
             // As a workaround, I'm not sure what would isAbsolute() return with unix-like path
-            jarFullPath = userInfo().homedir + jarFromSettings.slice(1)
+            jarFullPath = userInfo().homedir + jarFromSettings.slice(1);
         }
         else {
             if (isAbsolute(jarFromSettings)) {
-                jarFullPath = jarFromSettings
+                jarFullPath = jarFromSettings;
             }
             else {
                 // the default search path is current vault
-                jarFullPath = resolve(path, jarFromSettings)
+                jarFullPath = resolve(path, jarFromSettings);
             }
         }
 
         if (jarFullPath.length == 0) {
-            throw Error('Invalid local jar file')
+            throw Error('Invalid local jar file');
         }
 
         return [

src/settings.ts

@@ -44,9 +44,18 @@ export class PlantUMLSettingsTab extends PluginSettingTab {
             );
 
         if(Platform.isDesktopApp) {
+
+            const jarDesc = new DocumentFragment();
+            jarDesc.createDiv().innerHTML = "Path to local JAR<br>Supports:" +
+                "<ul>" +
+                "<li>Absolute path</li>" +
+                "<li>Path relative to vault</li>" +
+                "<li>Path relative to users home directory <code>~/</code></li>" +
+                "</ul>";
+
             new Setting(containerEl)
                 .setName("Local JAR")
-                .setDesc("Path to local PlantUML Jar")
+                .setDesc(jarDesc)
                 .addText(text => text.setPlaceholder(DEFAULT_SETTINGS.localJar)
                     .setValue(this.plugin.settings.localJar)
                     .onChange(async (value) => {

versions.json

@@ -21,5 +21,6 @@
 	"1.6.0": "0.13.0",
 	"1.6.1": "0.13.0",
 	"1.6.2": "0.13.0",
-	"1.6.3": "0.13.0"
+	"1.6.3": "0.13.0",
+	"1.6.4": "0.13.0"
 }