From e03f2b90d60972eb42fb9cd7a13c9778cfd5e137 Mon Sep 17 00:00:00 2001 From: meld-cp <18450687+meld-cp@users.noreply.github.com> Date: Wed, 8 Feb 2023 20:22:59 +0000 Subject: [PATCH] fix marker regex --- dist/manifest.json | 2 +- manifest.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/rci-markers.ts | 4 ++-- versions.json | 3 ++- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dist/manifest.json b/dist/manifest.json index 2bdc4e2..1570d30 100644 --- a/dist/manifest.json +++ b/dist/manifest.json @@ -1,7 +1,7 @@ { "id": "meld-build", "name": "Meld Build", - "version": "0.1.6", + "version": "0.1.7", "minAppVersion": "1.0.1", "description": "Write and execute (sandboxed) JavaScript to render templates, query DataView and create dynamic notes.", "author": "meld-cp", diff --git a/manifest.json b/manifest.json index 2bdc4e2..1570d30 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "meld-build", "name": "Meld Build", - "version": "0.1.6", + "version": "0.1.7", "minAppVersion": "1.0.1", "description": "Write and execute (sandboxed) JavaScript to render templates, query DataView and create dynamic notes.", "author": "meld-cp", diff --git a/package-lock.json b/package-lock.json index 4885ed2..51cc320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "meld-build-obsidian-plugin", - "version": "0.1.4", + "version": "0.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "meld-build-obsidian-plugin", - "version": "0.1.4", + "version": "0.1.6", "license": "MIT", "devDependencies": { "@types/handlebars": "^4.1.0", diff --git a/package.json b/package.json index d1cb8df..5382b51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meld-build-obsidian-plugin", - "version": "0.1.6", + "version": "0.1.7", "description": "This is a sample plugin for Obsidian (https://obsidian.md)", "main": "main.js", "scripts": { diff --git a/src/rci-markers.ts b/src/rci-markers.ts index d490dbe..09b7dad 100644 --- a/src/rci-markers.ts +++ b/src/rci-markers.ts @@ -10,7 +10,7 @@ export class MarkerRunContextImplemention implements TMarkerRunContext { private markerEndPrefix = '%%='; private markerEndSuffix = '%%' - private markerValueRegEx = '((?>.|\n|\r)*)'; + private markerValueRegEx = '((?:.|\n|\r)*)'; private vault: Vault; private log: RunLogger; @@ -89,7 +89,7 @@ export class MarkerRunContextImplemention implements TMarkerRunContext { + '(.*?)' // marker name end + this.escapeRegex(this.markerEndSuffix) ; - //console.debug({exp}); + console.debug({exp}); const rgexp = new RegExp(exp, 'g'); const matches = text.matchAll( rgexp ); diff --git a/versions.json b/versions.json index 13ff464..3b4e2b4 100644 --- a/versions.json +++ b/versions.json @@ -4,5 +4,6 @@ "0.1.3": "1.0.1", "0.1.4": "1.0.1", "0.1.5": "1.0.1", - "0.1.6": "1.0.1" + "0.1.6": "1.0.1", + "0.1.7": "1.0.1" } \ No newline at end of file