[fix] regarding [Bug]: Plot not showing #2

Author: leonhma

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       run: yarn install
 
     - name: Run version-bump
-      run: node version-bump.mjs
+      run: node version-bump.mjs ${{ github.event.release.tag_name }}
 
     - name: Commit and push changes
       run: |

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 yarn-error.log
 dist/
+copy.bat

package.json

@@ -7,9 +7,11 @@
 	"license": "MIT",
 	"private": true,
 	"scripts": {
-		"build": "rimraf dist && mkdir dist && cp manifest.json dist/manifest.json && webpack"
+		"build": "rimraf dist && make-dir dist && cpy manifest.json dist && webpack"
 	},
 	"devDependencies": {
+		"cpy-cli": "^4.1.0",
+		"make-dir-cli": "^3.0.0",
 		"rimraf": "^3.0.2",
 		"sass": "^1.51.0",
 		"sass-loader": "^12.6.0",

src/main.ts

@@ -27,41 +27,50 @@ export default class ObsidianFunctionPlot extends Plugin {
 	}
 
 	async functionPlotHandler(source: string, el: HTMLElement, _ctx: MarkdownPostProcessorContext): Promise<void> {
-		// styles
-		el.classList.add('functionplot')
-		// parse yaml for bounds and functions to plot
-		const header = (source.match(/-{3,}([^]+)-{3,}/) || [null, null])[1]
-		console.log(header)
-		const functions = (header ? source.substring(header.length) : source)
-			.split('\n')
-			.map(line => line.trim())
-			.filter(line => line.length > 0)
-		
-		const config: HeaderOptions = Object.assign(
-			{},
-			DEFAULT_HEADER_OPTIONS,
-			parseYaml(header || '')
-		)
+		try {
+			// styles
+			el.classList.add('functionplot')
+			// parse yaml for bounds and functions to plot
+			
+			const header = (source.match(/-{3}[^]+-{3}/) || [null])[0]
+			const functions = (header ? source.substring(header.length) : source)
+				.split('\n')
+				.map(line => line.trim())
+				.filter(line => line.length > 0)
+			
+			const config: HeaderOptions = Object.assign(
+				{},
+				DEFAULT_HEADER_OPTIONS,
+				parseYaml(header.match(/-{3,}([^]+?)-{3,}/)[1] || '')
+			)
 
-		// prepare options for call to FunctionPlotya
-		const fPlotOptions: FunctionPlotOptions = {
-			target: el as unknown as string,  // weird workaround
-			title: config.title,
-			grid: config.grid,
-			disableZoom: config.disableZoom,
-			xAxis: {
-				domain: [config.bounds[0], config.bounds[1]],
-				label: config.xLabel
-			},
-			yAxis: {
-				domain: [config.bounds[2], config.bounds[3]],
-				label: config.yLabel
-			},
-			data: functions.map(line => { return { "fn": line.split('=')[1].trim() } })
+			// prepare options for call to FunctionPlotya
+			const fPlotOptions: FunctionPlotOptions = {
+				target: el as unknown as string,  // weird workaround
+				title: config.title,
+				grid: config.grid,
+				disableZoom: config.disableZoom,
+				xAxis: {
+					domain: [config.bounds[0], config.bounds[1]],
+					label: config.xLabel
+				},
+				yAxis: {
+					domain: [config.bounds[2], config.bounds[3]],
+					label: config.yLabel
+				},
+				data: functions.map(line => { return { "fn": line.split('=')[1].trim() } })
+			}
+			// render
+			functionPlot(fPlotOptions)
+			// make text listen to stylesheet
+			el.querySelectorAll('text').forEach(el => el.setAttribute('fill', 'currentColor'))
+		} catch (e) {
+			el.innerHTML = `
+			<div style="border-radius:1em;background:black;opacity:0.5">
+				<p style="opacity:1;font-size:0.7em;padding:1em">
+					${e}\n\n${source}
+				</p>
+			</div>`
 		}
-		// render
-		functionPlot(fPlotOptions)
-		// make text listen to stylesheet
-		el.querySelectorAll('text').forEach(el => el.setAttribute('fill', 'currentColor'))
 	}
 }

version-bump.mjs

@@ -1,14 +1,19 @@
 import { readFileSync, writeFileSync } from "fs";
 
-const { version } = JSON.parse(readFileSync("package.json", "utf8"));
+const version = process.argv[2];
 
-// read minAppVersion from manifest.json and bump version to target version
+// read files
+let package_ = JSON.parse(readFileSync("package.json", "utf8"));
 let manifest = JSON.parse(readFileSync("manifest.json", "utf8"));
-const { minAppVersion } = manifest;
-manifest.version = version;
-writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t"));
-
-// update versions.json with target version and minAppVersion from manifest.json
 let versions = JSON.parse(readFileSync("versions.json", "utf8"));
+
+// index minAppVersion
 versions[version] = minAppVersion;
+
+// update versions
+package_.version = version;
+manifest.version = version;
+
+writeFileSync("package.json", JSON.stringify(package_, null, "\t"));
+writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t"));
 writeFileSync("versions.json", JSON.stringify(versions, null, "\t"));